diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index 4d8cfc5b20..fd3429a6b6 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -31,6 +31,7 @@
 #include "UI/ui_atlas.h"
 #include "UI/ControlMappingScreen.h"
 #include "UI/UIShader.h"
+#include "UI/GameSettingsScreen.h"
 
 extern void DrawBackground(float alpha);
 
@@ -218,7 +219,7 @@ void ControlMappingScreen::sendMessage(const char *message, const char *value) {
 	}
 	if (!strcmp(message, "settings")) {
 		UpdateUIState(UISTATE_MENU);
-		screenManager()->finishDialog(this, DR_OK);
+		screenManager()->push(new GameSettingsScreen(""));
 	}
 }
 
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 317a2b61f1..fa1baae86e 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -560,7 +560,6 @@ void MainScreen::sendMessage(const char *message, const char *value) {
 	}
 	if (!strcmp(message, "control mapping")) {
 		UpdateUIState(UISTATE_MENU);
-		screenManager()->push(new GameSettingsScreen(""));
 		screenManager()->push(new ControlMappingScreen());
 	}
 	if (!strcmp(message, "settings")) {