diff --git a/src/input.c b/src/input.c
index bf90a98d49..0d3b6d1c5b 100644
--- a/src/input.c
+++ b/src/input.c
@@ -224,7 +224,7 @@ static void input_scroll_drag_begin(int x, int y, rct_window* w, rct_widget* wid
  */
 static void input_scroll_drag_continue(int x, int y, rct_window* w)
 {
-	uint8 widgetIndex = _dragWidget.widget_index;
+	rct_widgetindex widgetIndex = _dragWidget.widget_index;
 	uint8 scrollIndex = _dragScrollIndex;
 
 	rct_widget* widget = &w->widgets[widgetIndex];
diff --git a/src/input.h b/src/input.h
index 2953eb2f92..b6d442761e 100644
--- a/src/input.h
+++ b/src/input.h
@@ -69,7 +69,7 @@ enum {
 typedef struct {
 	rct_windowclass window_classification;
 	rct_windownumber window_number;
-	uint8 widget_index;
+	rct_widgetindex widget_index;
 } widget_ref;
 
 extern uint8 gInputState;
diff --git a/src/interface/window.h b/src/interface/window.h
index b8a44147a1..15aaa1175a 100644
--- a/src/interface/window.h
+++ b/src/interface/window.h
@@ -43,6 +43,7 @@ typedef void wndproc(struct rct_window*, union rct_window_event*);
 
 typedef uint8 rct_windowclass;
 typedef uint16 rct_windownumber;
+typedef sint16 rct_widgetindex;
 
 typedef struct {
 	rct_windowclass classification;