@@ -85,7 +85,7 @@ Rectangle {
8585 Connections {
8686 target: ApplicationManager
8787 onApplicationAdded: {
88− ApplicationManager.requestFocusApplication(ApplicationManager.get(ApplicationManager.count-1).appId)
88+ ApplicationManager.requestFocusApplication(appId)
8989 }
9090
9191 onFocusRequested: {
@@ -158,7 +158,7 @@ Rectangle {
158158 readonly property int minHeight: units.gu(10)
159159
160160 onFocusChanged: {
161− if (focus) {
161+ if (focus && !ApplicationManager.focusedApplicationId === model.appId) {
162162 ApplicationManager.requestFocusApplication(model.appId);
163163 }
164164 }