@@ -104,7 +104,8 @@ Item {
104104 mainStageAppId = focusedApplicationId;
105105 priv.overlayOverride = false;
106106 if (priv.startingAppId == focusedApplicationId && sideStageImage.shown) {
107− sideStageImage.snapTo(root.width)
107+ // There was already a sidestage app on top. bring it back!
108+ ApplicationManager.focusApplication(priv.sideStageAppId)
108109 priv.startingAppId = "";
109110 }
110111 } else if (focusedApplication.stage == ApplicationInfoInterface.SideStage) {
@@ -216,10 +217,10 @@ Item {
216217 if (root.shown) {
217218 priv.mainStageAppId = application.appId;
218219 mainStageImage.switchTo(application)
220+ ApplicationManager.focusApplication(appId)
219221 if (sideStageImage.shown) {
220− sideStageImage.snapTo(root.width)
221− } else {
222− ApplicationManager.focusApplication(appId)
222+ // There was already a focused SS app. Bring it back
223+ ApplicationManager.focusApplication(priv.sideStageAppId)
223224 }
224225 } else {
225226 if (sideStageImage.shown) {