diff --git a/shell_client.cpp b/shell_client.cpp
index 0344d8ac5a..13b8449904 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -386,4 +386,9 @@ bool ShellClient::isInternal() const
            m_shellSurface->client() == waylandServer()->qtConnection();
 }
 
+xcb_window_t ShellClient::window() const
+{
+    return windowId();
+}
+
 }
diff --git a/shell_client.h b/shell_client.h
index 9c0cf2fcb0..5d165fe221 100644
--- a/shell_client.h
+++ b/shell_client.h
@@ -86,6 +86,7 @@ public:
     bool userCanSetFullScreen() const override;
     bool userCanSetNoBorder() const override;
     bool wantsInput() const override;
+    xcb_window_t window() const override;
 
     quint32 windowId() const {
         return m_windowId;
diff --git a/toplevel.h b/toplevel.h
index 49a0d030a1..ea21734546 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -205,7 +205,7 @@ class Toplevel
 public:
     explicit Toplevel();
     virtual xcb_window_t frameId() const;
-    xcb_window_t window() const;
+    virtual xcb_window_t window() const;
     QRect geometry() const;
     QSize size() const;
     QPoint pos() const;