diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index df5612bf7f..8a674b4741 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -2813,5 +2813,8 @@ void ReconstructUserInterface()
 	}
 
 	ReInitAllWindows();
-	ShowGameOptions();
+	if (_settings_client.gui.windows_titlebars) {
+		// Hack to prevent second click on the same button via button-up event
+		ShowGameOptions();
+	}
 }