@@ -67,7 +67,7 @@ AbstractStage {
6767 case "stagedWithSideStage":
6868 var orientations = mainApp.supportedOrientations;
6969 orientations |= Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation;
70− if (priv.sideStageItemId && !spreadView.surfaceDragging) {
70+ if (priv.sideStageItemId) {
7171 // If we have a sidestage app, support Portrait orientation
7272 // so that it will switch the sidestage app to mainstage on rotate to portrait
7373 orientations |= Qt.PortraitOrientation|Qt.InvertedPortraitOrientation;
@@ -261,7 +261,7 @@ AbstractStage {
261261 }
262262 if (mainStageIndex == 0 || sideStageIndex == 0) {
263263 if (mainStageIndex == 1 || sideStageIndex == 1) {
264− return 2;
264+ return topLevelSurfaceList.count > 2 ? 2 : -1;
265265 }
266266 return 1;
267267 }
@@ -503,7 +503,7 @@ AbstractStage {
503503 return 1;
504504 }
505505
506− return 2;
506+ return 1;
507507 }
508508
509509 onShownChanged: {