diff --git a/src/quest_editor/controllers/DebugController.ts b/src/quest_editor/controllers/DebugController.ts
index c9b34c2d..84bb18fa 100644
--- a/src/quest_editor/controllers/DebugController.ts
+++ b/src/quest_editor/controllers/DebugController.ts
@@ -6,7 +6,6 @@ import { GuiStore, GuiTool } from "../../core/stores/GuiStore";
 import { LogEntry } from "../../core/Logger";
 import { LogStore } from "../stores/LogStore";
 import { Severity } from "../../core/Severity";
-import { property } from "../../core/observable";
 
 export class DebugController extends Controller {
     readonly can_debug: Property<boolean>;
@@ -52,11 +51,11 @@ export class DebugController extends Controller {
 
             gui_store.on_global_keydown(GuiTool.QuestEditor, "F6", this.resume),
 
-            gui_store.on_global_keydown(GuiTool.QuestEditor, "F8", this.step_over),
+            gui_store.on_global_keydown(GuiTool.QuestEditor, "F10", this.step_over),
 
-            gui_store.on_global_keydown(GuiTool.QuestEditor, "F7", this.step_in),
+            gui_store.on_global_keydown(GuiTool.QuestEditor, "F11", this.step_in),
 
-            gui_store.on_global_keydown(GuiTool.QuestEditor, "Shift-F8", this.step_out),
+            gui_store.on_global_keydown(GuiTool.QuestEditor, "Shift-F11", this.step_out),
         );
     }
 
diff --git a/src/quest_editor/gui/DebugView.ts b/src/quest_editor/gui/DebugView.ts
index 4ba58fe9..8f6d7bfe 100644
--- a/src/quest_editor/gui/DebugView.ts
+++ b/src/quest_editor/gui/DebugView.ts
@@ -37,17 +37,17 @@ export class DebugView extends ResizableView {
         const step_over_button = new Button({
             text: "Step over",
             icon_left: Icon.LongArrowRight,
-            tooltip: "Execute the next line and step over any function calls (F8)",
+            tooltip: "Execute the next line and step over any function calls (F10)",
         });
         const step_in_button = new Button({
             text: "Step into",
             icon_left: Icon.LevelDown,
-            tooltip: "Execute the next line and step inside any function calls (F7)",
+            tooltip: "Execute the next line and step inside any function calls (F11)",
         });
         const step_out_button = new Button({
             text: "Step out",
             icon_left: Icon.LevelUp,
-            tooltip: "Execute until outside of current call frame (Shift-F8)",
+            tooltip: "Execute until outside of current call frame (Shift-F11)",
         });
         const stop_button = new Button({
             text: "Stop",