@@ -228,8 +228,9 @@ FocusScope {
228228 }
229229 }
230230
231− readonly property bool sideStageEnabled: root.shellOrientation == Qt.LandscapeOrientation ||
232− root.shellOrientation == Qt.InvertedLandscapeOrientation
231+ readonly property bool sideStageEnabled: root.mode === "stagedWithSideStage" &&
232+ (root.shellOrientation == Qt.LandscapeOrientation ||
233+ root.shellOrientation == Qt.InvertedLandscapeOrientation)
233234
234235 property var mainStageDelegate: null
235236 property var sideStageDelegate: null
@@ -913,7 +914,7 @@ FocusScope {
913914 rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
914915 rightEdgeFocusAnimation.start()
915916 }
916− } else if (state == "windowedRightEdge") {
917+ } else if (state == "windowedRightEdge" || state == "windowed") {
917918 claimFocus();
918919 } else {
919920 focusAnimation.start()