1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index 5a58d6d75..dcc4ad5c7 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -532,7 +532,8 @@ void QWaylandInputContext::setFocusObject(QObject *)
     if (mCurrentWindow && mCurrentWindow->handle()) {
         if (mCurrentWindow.data() != window || !inputMethodAccepted()) {
             struct ::wl_surface *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->object();
-            textInput()->disable(surface);
+            if (surface)
+                textInput()->disable(surface);
             mCurrentWindow.clear();
         }
     }