diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml
index ad433814a2..7fad8991db 100644
--- a/mods/cnc/chrome/editor.yaml
+++ b/mods/cnc/chrome/editor.yaml
@@ -576,6 +576,7 @@ Container@EDITOR_WORLD_ROOT:
 							Height: 25
 							Text: button-cancel
 							Font: Bold
+							Key: escape
 				Background@ACTOR_EDIT_PANEL:
 					Width: PARENT_WIDTH
 					Height: PARENT_HEIGHT
@@ -686,12 +687,14 @@ Container@EDITOR_WORLD_ROOT:
 									Height: 25
 									Text: button-cancel
 									Font: Bold
+									Key: escape
 								Button@OK_BUTTON:
 									X: 208
 									Width: 75
 									Height: 25
 									Text: button-container-ok
 									Font: Bold
+									Key: return
 		Container@MAP_EDITOR_TAB_CONTAINER:
 			Logic: MapEditorTabsLogic
 			X: WINDOW_WIDTH - 295
diff --git a/mods/common/chrome/editor.yaml b/mods/common/chrome/editor.yaml
index 06074068e1..f75dc12404 100644
--- a/mods/common/chrome/editor.yaml
+++ b/mods/common/chrome/editor.yaml
@@ -249,6 +249,18 @@ Container@EDITOR_WORLD_ROOT:
 			Y: 330
 			Width: 310
 			Height: WINDOW_HEIGHT - 422
+		MenuButton@OPTIONS_BUTTON:
+			Logic: MenuButtonsChromeLogic
+			MenuContainer: INGAME_MENU
+			HideIngameUI: true
+			Pause: true
+			Width: 60
+			Height: 25
+			Text: button-editor-world-root-options.label
+			TooltipText: button-editor-world-root-options.tooltip
+			TooltipContainer: TOOLTIP_CONTAINER
+			Font: Bold
+			Key: escape
 		Container@TILE_WIDGETS:
 			X: WINDOW_WIDTH - 320
 			Y: 354
@@ -541,6 +553,7 @@ Container@EDITOR_WORLD_ROOT:
 							Height: 25
 							Text: button-cancel
 							Font: Bold
+							Key: escape
 				Background@ACTOR_EDIT_PANEL:
 					X: 10
 					Y: 10
@@ -653,12 +666,14 @@ Container@EDITOR_WORLD_ROOT:
 									Height: 25
 									Text: button-cancel
 									Font: Bold
+									Key: escape
 								Button@OK_BUTTON:
 									X: 208
 									Width: 75
 									Height: 25
 									Text: button-container-ok
 									Font: Bold
+									Key: return
 		Container@MAP_EDITOR_TAB_CONTAINER:
 			Logic: MapEditorTabsLogic
 			X: WINDOW_WIDTH - 311
@@ -750,18 +765,6 @@ Container@EDITOR_WORLD_ROOT:
 							Y: 5
 							ImageCollection: editor
 							ImageName: history
-		MenuButton@OPTIONS_BUTTON:
-			Logic: MenuButtonsChromeLogic
-			MenuContainer: INGAME_MENU
-			HideIngameUI: true
-			Pause: true
-			Width: 60
-			Height: 25
-			Text: button-editor-world-root-options.label
-			TooltipText: button-editor-world-root-options.tooltip
-			TooltipContainer: TOOLTIP_CONTAINER
-			Font: Bold
-			Key: escape
 		Button@UNDO_BUTTON:
 			X: 70
 			Height: 25