diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp
index 79629a0e5c..eed96334d6 100644
--- a/src/openrct2-ui/input/Shortcuts.cpp
+++ b/src/openrct2-ui/input/Shortcuts.cpp
@@ -509,15 +509,29 @@ static void ShortcutIncreaseElementHeight()
         int action = -1;
         switch (w->tileInspectorPage)
         {
-            case TileInspectorPage::Surface:
-            case TileInspectorPage::Path:
-            case TileInspectorPage::Track:
-            case TileInspectorPage::Scenery:
-            case TileInspectorPage::Entrance:
-            case TileInspectorPage::Wall:
-            case TileInspectorPage::LargeScenery:
-            case TileInspectorPage::Banner:
-                action = WC_TILE_INSPECTOR__WIDX_HEIGHT_INCREASE;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_SURFACE:
+                action = WC_TILE_INSPECTOR__WIDX_SURFACE_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_PATH:
+                action = WC_TILE_INSPECTOR__WIDX_PATH_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_TRACK:
+                action = WC_TILE_INSPECTOR__WIDX_TRACK_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_SCENERY:
+                action = WC_TILE_INSPECTOR__WIDX_SCENERY_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_ENTRANCE:
+                action = WC_TILE_INSPECTOR__WIDX_ENTRANCE_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_WALL:
+                action = WC_TILE_INSPECTOR__WIDX_WALL_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_LARGE_SCENERY:
+                action = WC_TILE_INSPECTOR__WIDX_LARGE_SCENERY_SPINNER_HEIGHT_INCREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_BANNER:
+                action = WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_INCREASE;
                 break;
             case TileInspectorPage::Default:
                 break;
@@ -536,15 +550,29 @@ static void ShortcutDecreaseElementHeight()
         int action = -1;
         switch (w->tileInspectorPage)
         {
-            case TileInspectorPage::Surface:
-            case TileInspectorPage::Path:
-            case TileInspectorPage::Track:
-            case TileInspectorPage::Scenery:
-            case TileInspectorPage::Entrance:
-            case TileInspectorPage::Wall:
-            case TileInspectorPage::LargeScenery:
-            case TileInspectorPage::Banner:
-                action = WC_TILE_INSPECTOR__WIDX_HEIGHT_DECREASE;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_SURFACE:
+                action = WC_TILE_INSPECTOR__WIDX_SURFACE_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_PATH:
+                action = WC_TILE_INSPECTOR__WIDX_PATH_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_TRACK:
+                action = WC_TILE_INSPECTOR__WIDX_TRACK_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_SCENERY:
+                action = WC_TILE_INSPECTOR__WIDX_SCENERY_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_ENTRANCE:
+                action = WC_TILE_INSPECTOR__WIDX_ENTRANCE_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_WALL:
+                action = WC_TILE_INSPECTOR__WIDX_WALL_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_LARGE_SCENERY:
+                action = WC_TILE_INSPECTOR__WIDX_LARGE_SCENERY_SPINNER_HEIGHT_DECREASE;
+                break;
+            case WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_BANNER:
+                action = WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_DECREASE;
                 break;
             case TileInspectorPage::Default:
                 break;
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index 865cc57970..274c3e1ed2 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -548,8 +548,30 @@ enum
 #define WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE 6
 #define WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE 8
 #define WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE 9
-#define WC_TILE_INSPECTOR__WIDX_HEIGHT_INCREASE 27
-#define WC_TILE_INSPECTOR__WIDX_HEIGHT_DECREASE 28
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_SURFACE TileInspectorPage::Surface
+#define WC_TILE_INSPECTOR__WIDX_SURFACE_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_SURFACE_SPINNER_HEIGHT_DECREASE 27
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_PATH TileInspectorPage::Path
+#define WC_TILE_INSPECTOR__WIDX_PATH_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_PATH_SPINNER_HEIGHT_DECREASE 27
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_TRACK TileInspectorPage::Track
+#define WC_TILE_INSPECTOR__WIDX_TRACK_SPINNER_HEIGHT_INCREASE 27
+#define WC_TILE_INSPECTOR__WIDX_TRACK_SPINNER_HEIGHT_DECREASE 28
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_SCENERY TileInspectorPage::Scenery
+#define WC_TILE_INSPECTOR__WIDX_SCENERY_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_SCENERY_SPINNER_HEIGHT_DECREASE 27
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_ENTRANCE TileInspectorPage::Entrance
+#define WC_TILE_INSPECTOR__WIDX_ENTRANCE_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_ENTRANCE_SPINNER_HEIGHT_DECREASE 27
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_WALL TileInspectorPage::Wall
+#define WC_TILE_INSPECTOR__WIDX_WALL_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_WALL_SPINNER_HEIGHT_DECREASE 27
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_LARGE_SCENERY TileInspectorPage::LargeScenery
+#define WC_TILE_INSPECTOR__WIDX_LARGE_SCENERY_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_LARGE_SCENERY_SPINNER_HEIGHT_DECREASE 27
+#define WC_TILE_INSPECTOR__TILE_INSPECTOR_PAGE_BANNER TileInspectorPage::Banner
+#define WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_INCREASE 26
+#define WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_DECREASE 27
 
 enum class PromptMode : uint8_t
 {