@@ -50,6 +50,8 @@ FocusScope {
5050
5151 property bool dashShown: dash.shown
5252
53+ property bool sideStageEnabled: shell.width >= units.gu(60)
54+
5355 function activateApplication(appId) {
5456 if (ApplicationManager.findApplication(appId)) {
5557 print("Shell.qml: activating app", appId);
@@ -57,10 +59,7 @@ FocusScope {
5759 } else {
5860 print("starting app", appId);
5961
60− // FIXME:
61−// var execFlags = sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
62− var execFlags = ApplicationManager.ForceMainStage;
63−
62+ var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
6463 ApplicationManager.startApplication(appId, execFlags);
6564 }
6665 }
@@ -242,8 +241,7 @@ FocusScope {
242241 id: applicationsDisplayLoader
243242 anchors.fill: parent
244243
245−// source: "Stages/StageWithSideStage.qml"
246− source: "Stages/PhoneStage.qml"
244+ source: shell.sideStageEnabled ? "Stages/StageWithSideStage.qml" : "Stages/PhoneStage.qml"
247245
248246 Binding {
249247 target: applicationsDisplayLoader.item