@@ -686,6 +686,7 @@ AbstractStage {
686686
687687 function claimFocus() {
688688 if (root.state == "spread") {
689+ spreadItem.highlightedIndex = index
689690 priv.goneToSpread = false;
690691 }
691692 if (appDelegate.stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
@@ -701,12 +702,7 @@ AbstractStage {
701702 Connections {
702703 target: model.surface
703704 onFocusRequested: {
704− if (root.state == "spread") {
705− spreadItem.highlightedIndex = index
706− priv.goneToSpread = false;
707− } else {
708− claimFocus();
709− }
705+ claimFocus();
710706 }
711707 }
712708 Connections {