diff --git a/src/core/window.c b/src/core/window.c
index 7f38a6cc8..4a2c3b8cf 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3555,7 +3555,7 @@ meta_window_activate_full (MetaWindow     *window,
       /* We've marked it as demanding, don't need to do anything else. */
       return;
     }
-  else if (window->transient_for != NULL)
+  else if (window->transient_for != NULL && !window->on_all_workspaces)
     {
       /* Move transients to current workspace - preference dialogs should appear over
          the source window.  */