@@ -235,6 +235,12 @@ FocusScope {
235235 readonly property bool sideStageEnabled: root.mode === "stagedWithSideStage" &&
236236 (root.shellOrientation == Qt.LandscapeOrientation ||
237237 root.shellOrientation == Qt.InvertedLandscapeOrientation)
238+ onSideStageEnabledChanged: {
239+ for (var i = 0; i < appRepeater.count; i++) {
240+ appRepeater.itemAt(i).refreshStage();
241+ }
242+ priv.updateMainAndSideStageIndexes();
243+ }
238244
239245 property var mainStageDelegate: null
240246 property var sideStageDelegate: null
@@ -255,7 +261,7 @@ FocusScope {
255261 priv.sideStageItemId = 0;
256262 priv.sideStageAppId = "";
257263 priv.mainStageDelegate = appRepeater.itemAt(0);
258− priv.mainStageAppId = topLevelSurfaceList.idAt(0);
264+ priv.mainStageItemId = topLevelSurfaceList.idAt(0);
259265 priv.mainStageAppId = topLevelSurfaceList.applicationAt(0) ? topLevelSurfaceList.applicationAt(0).appId : ""
260266 return;
261267 }
@@ -451,7 +457,7 @@ FocusScope {
451457 },
452458 State {
453459 name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
454− PropertyChanges { target: triGestureArea; enabled: true }
460+ PropertyChanges { target: triGestureArea; enabled: priv.sideStageEnabled }
455461 PropertyChanges { target: sideStage; visible: true }
456462 },
457463 State {
@@ -552,7 +558,7 @@ FocusScope {
552558 bottom: parent.bottom
553559 }
554560 width: appContainer.width - sideStage.width
555− enabled: sideStage.enabled
561+ enabled: priv.sideStageEnabled
556562
557563 onDropped: {
558564 drop.source.appDelegate.saveStage(ApplicationInfoInterface.MainStage);
@@ -596,7 +602,7 @@ FocusScope {
596602 }
597603
598604 onShownChanged: {
599− if (!shown && priv.mainStageDelegate) {
605+ if (!shown && priv.mainStageDelegate && !root.spreadShown) {
600606 priv.mainStageDelegate.claimFocus();
601607 }
602608 }
@@ -709,10 +715,6 @@ FocusScope {
709715 }
710716 }
711717 }
712− Connections {
713− target: priv
714− onSideStageEnabledChanged: refreshStage()
715− }
716718
717719 readonly property alias application: decoratedWindow.application
718720 readonly property alias minimumWidth: decoratedWindow.minimumWidth