@@ -55,7 +55,8 @@ Item {
5555 property bool surfaceInitialized: false
5656
5757 function forceSurfaceActiveFocusIfReady() {
58− if (sessionContainer.surface.focus &&
58+ if (sessionContainer.surface !== null &&
59+ sessionContainer.surface.focus &&
5960 sessionContainer.surface.parent === sessionContainer.surfaceContainer &&
6061 sessionContainer.surface.enabled) {
6162 sessionContainer.surface.forceActiveFocus();
@@ -114,10 +115,10 @@ Item {
114115 onSurfaceChanged: {
115116 if (sessionContainer.surface) {
116117 surfaceInitTimer.start();
118+ d.forceSurfaceActiveFocusIfReady();
117119 } else {
118120 d.surfaceInitialized = false;
119121 }
120− d.forceSurfaceActiveFocusIfReady();
121122 }
122123 }
123124