diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml
index 5de2287b27..5de03433a3 100644
--- a/mods/cnc/chrome/editor.yaml
+++ b/mods/cnc/chrome/editor.yaml
@@ -565,24 +565,40 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Text: Tiles
 					Font: Bold
+					Key: EditorTilesTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: Tiles
+					TooltipContainer: TOOLTIP_CONTAINER
 				Button@OVERLAYS_TAB:
 					X: 70
 					Width: 80
 					Height: 25
 					Text: Overlays
 					Font: Bold
+					Key: EditorOverlaysTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: Overlays
+					TooltipContainer: TOOLTIP_CONTAINER
 				Button@ACTORS_TAB:
 					X: 149
 					Width: 71
 					Height: 25
 					Text: Actors
 					Font: Bold
+					Key: EditorActorsTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: Actors
+					TooltipContainer: TOOLTIP_CONTAINER
 				Button@HISTORY_TAB:
 					X: 219
 					Width: 71
 					Height: 25
 					Text: History
 					Font: Bold
+					Key: EditorHistoryTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: History
+					TooltipContainer: TOOLTIP_CONTAINER
 		Button@UNDO_BUTTON:
 			X: WINDOW_RIGHT - 800
 			Y: 5
diff --git a/mods/common/chrome/editor.yaml b/mods/common/chrome/editor.yaml
index 2827b8cf95..0d237f5c46 100644
--- a/mods/common/chrome/editor.yaml
+++ b/mods/common/chrome/editor.yaml
@@ -533,24 +533,40 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Text: Tiles
 					Font: Bold
+					Key: EditorTilesTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: Tiles
+					TooltipContainer: TOOLTIP_CONTAINER
 				Button@OVERLAYS_TAB:
 					X: 70
 					Width: 90
 					Height: 25
 					Text: Overlays
 					Font: Bold
+					Key: EditorOverlaysTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: Overlays
+					TooltipContainer: TOOLTIP_CONTAINER
 				Button@ACTORS_TAB:
 					X: 160
 					Width: 70
 					Height: 25
 					Text: Actors
 					Font: Bold
+					Key: EditorActorsTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: Actors
+					TooltipContainer: TOOLTIP_CONTAINER
 				Button@HISTORY_TAB:
 					X: 230
 					Width: 70
 					Height: 25
 					Text: History
 					Font: Bold
+					Key: EditorHistoryTab
+					TooltipTemplate: BUTTON_TOOLTIP
+					TooltipText: History
+					TooltipContainer: TOOLTIP_CONTAINER
 		MenuButton@OPTIONS_BUTTON:
 			Logic: MenuButtonsChromeLogic
 			MenuContainer: INGAME_MENU
diff --git a/mods/common/hotkeys/editor.yaml b/mods/common/hotkeys/editor.yaml
index 85a6da96b9..f323e4b13e 100644
--- a/mods/common/hotkeys/editor.yaml
+++ b/mods/common/hotkeys/editor.yaml
@@ -19,3 +19,23 @@ EditorCopy: C Ctrl
 	Contexts: Editor
 	Platform:
 		OSX: C Meta
+
+EditorTilesTab: E
+	Description: Tiles Tab
+	Types: Editor
+	Contexts: Editor
+
+EditorOverlaysTab: R
+	Description: Overlays Tab
+	Types: Editor
+	Contexts: Editor
+
+EditorActorsTab: T
+	Description: Actors Tab
+	Types: Editor
+	Contexts: Editor
+
+EditorHistoryTab: Y
+	Description: History Tab
+	Types: Editor
+	Contexts: Editor