diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 210f4a133..536ccf447 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -2861,8 +2861,9 @@ meta_window_x11_configure_request (MetaWindow *window,
                       window->desc);
         }
       else if (active_window &&
-               !meta_window_x11_same_application (window, active_window) &&
-               !meta_window_same_client (window, active_window) &&
+               (active_window->client_type != window->client_type ||
+                (!meta_window_x11_same_application (window, active_window) &&
+                 !meta_window_same_client (window, active_window))) &&
                XSERVER_TIME_IS_BEFORE (window->net_wm_user_time,
                                        active_window->net_wm_user_time))
         {