diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp
index 9859fb6b56..7933c60b1f 100644
--- a/src/bootstrap_gui.cpp
+++ b/src/bootstrap_gui.cpp
@@ -239,7 +239,7 @@ public:
 
 	void DrawWidget(const Rect &r, int widget) const override
 	{
-		if (widget != 0) return;
+		if (widget != WID_BAFD_QUESTION) return;
 
 		DrawStringMultiLine(r.Shrink(WidgetDimensions::scaled.frametext), STR_MISSING_GRAPHICS_SET_MESSAGE, TC_FROMSTRING, SA_CENTER);
 	}
diff --git a/src/screenshot_gui.cpp b/src/screenshot_gui.cpp
index 060eb4933e..a59fc14407 100644
--- a/src/screenshot_gui.cpp
+++ b/src/screenshot_gui.cpp
@@ -29,10 +29,9 @@ struct ScreenshotWindow : Window {
 
 	void OnClick([[maybe_unused]] Point pt, int widget, [[maybe_unused]] int click_count) override
 	{
-		if (widget < 0) return;
 		ScreenshotType st;
 		switch (widget) {
-			default:
+			default: return;
 			case WID_SC_TAKE:             st = SC_VIEWPORT;    break;
 			case WID_SC_TAKE_ZOOMIN:      st = SC_ZOOMEDIN;    break;
 			case WID_SC_TAKE_DEFAULTZOOM: st = SC_DEFAULTZOOM; break;