diff --git a/src/game.c b/src/game.c
index 65b25027f6..9442a15757 100644
--- a/src/game.c
+++ b/src/game.c
@@ -619,6 +619,7 @@ static void input_mouseover(int x, int y, rct_window *w, int widgetIndex)
  */
 static void input_mouseover_widget_check(rct_windowclass windowClass, rct_windownumber windowNumber, int widgetIndex)
 {
+	if (widgetIndex == -1) return; //Prevents invalid widgets being clicked source of bug is elsewhere
 	// Check if widget cursor was over has changed
 	if (windowClass != RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWCLASS, rct_windowclass) ||
 		windowNumber != RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWNUMBER, rct_windownumber) ||
diff --git a/src/window_main.c b/src/window_main.c
index 2e0fca00cc..b1672ef24a 100644
--- a/src/window_main.c
+++ b/src/window_main.c
@@ -24,7 +24,7 @@
 #include "window.h"
 
 rct_widget window_main_widgets[] = {
-	{ WWT_VIEWPORT, 0, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0xFFFFFFFF, 0xFFFF },
+	{ WWT_VIEWPORT, 0, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0xFFFFFFFE, 0xFFFF },
 	{ WIDGETS_END },
 };