diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index f6d86bb39ed..682172bf8bf 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -385,12 +385,6 @@ void QWaylandDisplay::setLastInputDevice(QWaylandInputDevice *device, uint32_t s
     mLastInputWindow = win;
 }
 
-bool QWaylandDisplay::shellManagesActiveState() const
-{
-    //TODO: This should be part of a shell interface used by the shell protocol implementations
-    return mShellXdg;
-}
-
 void QWaylandDisplay::handleWindowActivated(QWaylandWindow *window)
 {
     if (mActiveWindows.contains(window))
@@ -414,7 +408,7 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic
 {
     QWaylandWindow *keyboardFocus = inputDevice->keyboardFocus();
 
-    if (!shellManagesActiveState() && mLastKeyboardFocus != keyboardFocus) {
+    if (!keyboardFocus->shellSurface()->shellManagesActiveState() && mLastKeyboardFocus != keyboardFocus) {
         if (keyboardFocus)
             handleWindowActivated(keyboardFocus);
         if (mLastKeyboardFocus)
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay_p.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
index 237be5b783f..3f5538ec22e 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
@@ -169,7 +169,6 @@ public:
     QWaylandWindow *lastInputWindow() const;
     void setLastInputDevice(QWaylandInputDevice *device, uint32_t serial, QWaylandWindow *window);
 
-    bool shellManagesActiveState() const;
     void handleWindowActivated(QWaylandWindow *window);
     void handleWindowDeactivated(QWaylandWindow *window);
     void handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice);
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h
index 726d103f9dd..c99e586d58a 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h
@@ -85,6 +85,7 @@ public:
     virtual void setContentOrientationMask(Qt::ScreenOrientations orientation) { Q_UNUSED(orientation) }
 
     virtual void sendProperty(const QString &name, const QVariant &value);
+    virtual bool shellManagesActiveState() const { return false; }
 
     inline QWaylandWindow *window() { return m_window; }
 
diff --git a/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h b/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
index e367980b7fc..bc72820a144 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
@@ -89,6 +89,8 @@ public:
     void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
     void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
 
+    bool shellManagesActiveState() const Q_DECL_OVERRIDE { return true; }
+
     bool isFullscreen() const { return m_fullscreen; }
     bool isMaximized() const { return m_maximized; }