diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 13fd7b1f8d..5c43b5c25f 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -894,7 +894,7 @@ void TouchTestScreen::OnImmersiveModeChange(UI::EventParams &e) {
 
 void TouchTestScreen::OnRenderingBackend(UI::EventParams &e) {
 	g_Config.Save("GameSettingsScreen::RenderingBackend");
-	System_RestartApp("--touchscreentest");
+	System_RestartApp("--start-screen=touchscreentest");
 }
 
 void TouchTestScreen::OnRecreateActivity(UI::EventParams &e) {
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 9aed67a5c6..5d158d31ce 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1723,7 +1723,7 @@ void TriggerRestart(const char *why, bool editThenRestore, const Path &gamePath)
 	// Extra save here to make sure the choice really gets saved even if there are shutdown bugs in
 	// the GPU backend code.
 	g_Config.Save(why);
-	std::string param = "--gamesettings";
+	std::string param = "--start-screen=gamesettings";
 	if (editThenRestore) {
 		// We won't pass the gameID, so don't resume back into settings.
 		param.clear();
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 1435c92907..172d011574 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -807,8 +807,8 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
 		// Launch into specified start screen. This is useful for testing UI, more screens can be easily added here.
 		if (equals(cmdLineOptions.startScreen.value(), "touchscreentest")) {
 			g_screenManager->switchScreen(new MainScreen());
+			g_screenManager->push(new TouchTestScreen(Path()));
 		}
-		g_screenManager->push(new TouchTestScreen(Path()));
 		if (equals(cmdLineOptions.startScreen.value(), "gamesettings")) {
 			g_screenManager->switchScreen(new LogoScreen(AfterLogoScreen::TO_GAME_SETTINGS));
 		} else if (equals(cmdLineOptions.startScreen.value(), "developertools")) {