diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index 0149ecc52b..2943538c08 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -19,6 +19,8 @@ sm-ssc v1.2 | 201012xx
 * [ScreenSelectMaster] Fix DoSwitchAnyways to actually work again.
 * [Screen] Added SetNextScreenName(string) and SetPrevScreenName(string)
   Lua bindings. [freem]
+* [ScreenInstallOverlay] Installs won't jump to SelMusic on Gameplay or System
+  Menus (e.g. Edit Mode) anymore on download completion. [freem]
 
 20101220
 --------
diff --git a/src/ScreenInstallOverlay.cpp b/src/ScreenInstallOverlay.cpp
index 4841a10d2d..ba89a96bc6 100644
--- a/src/ScreenInstallOverlay.cpp
+++ b/src/ScreenInstallOverlay.cpp
@@ -370,7 +370,9 @@ void ScreenInstallOverlay::Update( float fDeltaTime )
 			sInitialScreen = StepMania::GetInitialScreen();
 		}
 
-		SCREENMAN->SetNewScreen( sInitialScreen );
+		Screen *curScreen = SCREENMAN->GetTopScreen();
+		if(curScreen->GetScreenType() == game_menu || curScreen->GetScreenType() == attract)
+			SCREENMAN->SetNewScreen( sInitialScreen );
 	}
 }