diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 815024d40b..37f358edfa 100644
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -63,7 +63,7 @@ class wxAdoptedWindow: public wxWindow
     wxAdoptedWindow(WXWindow window);
     ~wxAdoptedWindow();
 
-    void SetHandle(WXWindow window) { m_mainWindow = window; }
+    void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }
     WXWindow GetHandle() const { return GetMainWindow(); }
 };