diff --git a/src/wayland/autotests/client/test_wayland_seat.cpp b/src/wayland/autotests/client/test_wayland_seat.cpp
index 26e21527f0..4ea8a2bb40 100644
--- a/src/wayland/autotests/client/test_wayland_seat.cpp
+++ b/src/wayland/autotests/client/test_wayland_seat.cpp
@@ -1563,7 +1563,8 @@ void TestWaylandSeat::testKeyboard()
     QSignalSpy serverSurfaceDestroyedSpy(serverSurface, &QObject::destroyed);
     QVERIFY(serverSurfaceDestroyedSpy.isValid());
     delete s;
-    QVERIFY(serverSurfaceDestroyedSpy.wait());
+    QVERIFY(leftSpy.wait());
+    QCOMPARE(serverSurfaceDestroyedSpy.count(), 1);
     QVERIFY(!m_seatInterface->focusedKeyboardSurface());
     QVERIFY(!m_seatInterface->focusedKeyboard());
     QVERIFY(!serverKeyboard->focusedSurface());
diff --git a/src/wayland/keyboard_interface.cpp b/src/wayland/keyboard_interface.cpp
index a5ffd8ab70..671fc1d9de 100644
--- a/src/wayland/keyboard_interface.cpp
+++ b/src/wayland/keyboard_interface.cpp
@@ -121,9 +121,12 @@ void KeyboardInterface::setFocusedSurface(SurfaceInterface *surface, quint32 ser
     if (!d->focusedSurface) {
         return;
     }
-    d->destroyConnection = connect(d->focusedSurface, &QObject::destroyed, this,
+    d->destroyConnection = connect(d->focusedSurface, &Resource::aboutToBeUnbound, this,
         [this] {
             Q_D();
+            if (d->resource) {
+                wl_keyboard_send_leave(d->resource, d->global->display()->nextSerial(), d->focusedSurface->resource());
+            }
             d->focusedSurface = nullptr;
             d->focusedChildSurface.clear();
         }
diff --git a/src/wayland/server/resource.cpp b/src/wayland/server/resource.cpp
index eb735e9dd5..f728ff3905 100644
--- a/src/wayland/server/resource.cpp
+++ b/src/wayland/server/resource.cpp
@@ -63,6 +63,7 @@ void Resource::Private::create(ClientConnection *c, quint32 version, quint32 id)
 void Resource::Private::unbind(wl_resource *r)
 {
     Private *p = cast<Private>(r);
+    emit p->q->aboutToBeUnbound();
     p->resource = nullptr;
     emit p->q->unbound();
     p->q->deleteLater();
diff --git a/src/wayland/server/resource.h b/src/wayland/server/resource.h
index 0cf51fb44d..c513815db4 100644
--- a/src/wayland/server/resource.h
+++ b/src/wayland/server/resource.h
@@ -81,6 +81,16 @@ Q_SIGNALS:
      * @since 5.24
      **/
     void unbound();
+    /**
+     * This signal is emitted when the client is in the process of unbinding the Resource.
+     * In opposite to @link{unbound} the @link{resource} is still valid and allows to perform
+     * cleanup tasks. Example: send a keyboard leave for the Surface which is in the process of
+     * getting destroyed.
+     *
+     * @see unbound
+     * @since 5.37
+     **/
+    void aboutToBeUnbound();
 
 protected:
     class Private;