diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp
index f340f6ea30..4a36dd3490 100644
--- a/src/openrct2-ui/input/MouseInput.cpp
+++ b/src/openrct2-ui/input/MouseInput.cpp
@@ -459,12 +459,12 @@ static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState
 
 #pragma region Window positioning / resizing
 
-void InputWindowPositionBegin(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
+void InputWindowPositionBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     _inputState = InputState::PositioningWindow;
-    gInputDragLast = screenCoords - w->windowPos;
-    _dragWidget.window_classification = w->classification;
-    _dragWidget.window_number = w->number;
+    gInputDragLast = screenCoords - w.windowPos;
+    _dragWidget.window_classification = w.classification;
+    _dragWidget.window_number = w.number;
     _dragWidget.widget_index = widgetIndex;
 }
 
@@ -1048,7 +1048,7 @@ static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, r
             }
             break;
         case WindowWidgetType::Caption:
-            InputWindowPositionBegin(w, widgetIndex, screenCoords);
+            InputWindowPositionBegin(*w, widgetIndex, screenCoords);
             break;
         case WindowWidgetType::Scroll:
             InputScrollBegin(*w, widgetIndex, screenCoords);
diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
index b7ca15a086..831ea94251 100644
--- a/src/openrct2-ui/windows/EditorInventionsList.cpp
+++ b/src/openrct2-ui/windows/EditorInventionsList.cpp
@@ -665,7 +665,7 @@ public:
         width = stringWidth;
         Invalidate();
 
-        InputWindowPositionBegin(this, 0, gTooltipCursor);
+        InputWindowPositionBegin(*this, 0, gTooltipCursor);
     }
 
     const ResearchItem& GetItem() const
diff --git a/src/openrct2/Input.h b/src/openrct2/Input.h
index 0de27cf7d4..2d5922f0d6 100644
--- a/src/openrct2/Input.h
+++ b/src/openrct2/Input.h
@@ -92,7 +92,7 @@ extern InputState _inputState;
 extern uint8_t _inputFlags;
 extern uint16_t _tooltipNotShownTicks;
 
-void InputWindowPositionBegin(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
+void InputWindowPositionBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
 
 void title_handle_keyboard_input();
 void GameHandleInput();