@@ -50,7 +50,7 @@ Item {
5050 mainStageFocusedApplication = null;
5151 sideStageFocusedApplication = null;
5252 } else {
53− if (app.stage == ApplicationInfo.MainStage || !sideStageEnabled) {
53+ if (app.stage == ApplicationInfo.MainStage) {
5454 mainStageFocusedApplication = app;
5555 // possible the side stage app being unfocused fired this signal, so check for it
5656 if (sideStageFocusedApplication && !sideStageFocusedApplication.focused)
@@ -64,7 +64,15 @@ Item {
6464 }
6565 }
6666
67− onFocusRequested: root.focusRequested(appId);
67+ onFocusRequested: {
68+ // if no side stage enabled, override application's stage parameter
69+ var app = ApplicationManager.findApplication(appId);
70+ if (app && app.stage === ApplicationInfo.SideStage && !sideStageEnabled) {
71+ app.stage = ApplicationInfo.MainStage;
72+ }
73+
74+ root.focusRequested(appId);
75+ }
6876 }
6977
7078 function activateApplication(desktopFile, argument) {
@@ -143,7 +151,7 @@ Item {
143151 var app = ApplicationManager.get(i);
144152
145153 // if stage not specified and using sidestage, return whichever app running on either stage
146− if (app.appId == appId && (!sideStageEnabled || stage == undefined || app.stage == stage)) {
154+ if (app.appId == appId && (stage == undefined || app.stage == stage)) {
147155 return app;
148156 }
149157 }