@@ -139,9 +139,16 @@ Rectangle {
139139 if (priv.sideStageAppId == appId) {
140140 priv.sideStageAppId = "";
141141 }
142+
142143 if (ApplicationManager.count == 0) {
143144 spreadView.phase = 0;
144145 spreadView.contentX = -spreadView.shift;
146+ } else if (spreadView.closingIndex == -1) {
147+ // Unless we're closing the app ourselves in the spread,
148+ // lets make sure the spread doesn't mess up by the changing app list.
149+ spreadView.phase = 0;
150+ spreadView.contentX = -spreadView.shift;
151+ ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
145152 }
146153 }
147154 }