1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
index 5ab285ad97d..0ccc4dba57a 100644
--- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
@@ -192,12 +192,10 @@ void QWaylandInputContext::setFocusObject(QObject *object)
     if (window && window->handle()) {
         if (mCurrentWindow.data() != window) {
             if (!inputMethodAccepted()) {
-                if (mCurrentWindow) {
-                    auto *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->wlSurface();
-                    if (surface)
-                        inputInterface->disableSurface(surface);
-                    mCurrentWindow.clear();
-                }
+                auto *surface = static_cast<QWaylandWindow *>(window->handle())->wlSurface();
+                if (surface)
+                    inputInterface->disableSurface(surface);
+                mCurrentWindow.clear();
             } else {
                 auto *surface = static_cast<QWaylandWindow *>(window->handle())->wlSurface();
                 if (surface) {