@@ -162,9 +162,6 @@ Rectangle {
162162 property var focusStack: [] // focus stack of appIds
163163
164164 function addToFocusStack(appId) {
165− if (appId === "unity8-dash")
166− return;
167−
168165 var oldIndex = focusStack.indexOf(appId);
169166 if (oldIndex != -1) {
170167 // remove the old item
@@ -175,9 +172,6 @@ Rectangle {
175172 }
176173
177174 function removeAndFocusPreviousInStack(appId) {
178− if (appId === "unity8-dash")
179− return;
180−
181175 var removedIndex = focusStack.indexOf(appId);
182176 if (removedIndex != -1) {
183177 focusStack.splice(removedIndex, 1); // remove one item from the focus stack
@@ -199,10 +193,12 @@ Rectangle {
199193 focusStack.forEach(function(appId) {
200194 var appDelegate = appRepeater.itemAt(indexOf(appId));
201195 if (appDelegate && !appDelegate.minimized) {
202− // we don't want to mess with the focuStack itself or change the focus to a different window
196+ // we don't want to change the focus to a different window
203197 appDelegate.minimized = true;
204198 }
205199 });
200+ ApplicationManager.unfocusCurrentApplication(); // no app should have focus at this point
201+ focusStack = [];
206202 }
207203 }
208204