diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index 566a0ff47e9..45714e2fecc 100644
--- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -637,17 +637,20 @@ bool QWaylandXdgSurface::requestActivate()
             // focus stealing prevention indication, so requestXdgActivationToken call
             // is still necessary in that case.
             const auto wlWindow = focusWindow ? static_cast<QWaylandWindow*>(focusWindow->handle()) : m_window;
-            if (const auto xdgSurface = qobject_cast<QWaylandXdgSurface *>(wlWindow->shellSurface())) {
-                if (const auto seat = wlWindow->display()->lastInputDevice()) {
-                    const auto tokenProvider = activation->requestXdgActivationToken(
-                            wlWindow->display(), wlWindow->wlSurface(), seat->serial(), xdgSurface->m_appId);
-                    connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this,
-                            [this, tokenProvider](const QString &token) {
-                                m_shell->activation()->activate(token, window()->wlSurface());
-                                tokenProvider->deleteLater();
-                            });
-                    return true;
-                }
+
+            QString appId;
+            if (const auto xdgSurface = qobject_cast<QWaylandXdgSurface *>(wlWindow->shellSurface()))
+                appId = xdgSurface->m_appId;
+
+            if (const auto seat = wlWindow->display()->lastInputDevice()) {
+                const auto tokenProvider = activation->requestXdgActivationToken(
+                        wlWindow->display(), wlWindow->wlSurface(), seat->serial(), appId);
+                connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this,
+                        [this, tokenProvider](const QString &token) {
+                            m_shell->activation()->activate(token, window()->wlSurface());
+                            tokenProvider->deleteLater();
+                        });
+                return true;
             }
         }
     }