@@ -77,7 +77,7 @@ Rectangle {
7777 var appIndex = priv.indexOf(appId);
7878 var appDelegate = appRepeater.itemAt(appIndex);
7979 appDelegate.minimized = false;
80− ApplicationManager.focusApplication(appId);
80+ appDelegate.focus = true;
8181 }
8282 }
8383
@@ -179,7 +179,7 @@ Rectangle {
179179 function focusSelected() {
180180 if (appRepeater.highlightedIndex != -1) {
181181 var application = ApplicationManager.get(appRepeater.highlightedIndex);
182− ApplicationManager.focusApplication(application.appId);
182+ ApplicationManager.requestFocusApplication(application.appId)
183183 }
184184 }
185185
@@ -204,7 +204,11 @@ Rectangle {
204204 property bool maximized: false
205205 property bool minimized: false
206206
207− focus: priv.focusedAppId === model.appId && root.state !== "altTab"
207+ onFocusChanged: {
208+ if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
209+ ApplicationManager.focusApplication(model.appId);
210+ }
211+ }
208212
209213 Binding {
210214 target: ApplicationManager.get(index)
@@ -315,7 +319,7 @@ Rectangle {
315319 resizeHandleWidth: units.gu(2)
316320 windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
317321
318− onPressed: ApplicationManager.focusApplication(model.appId);
322+ onPressed: { appDelegate.focus = true; }
319323 }
320324
321325 DecoratedWindow {