diff --git a/src/shell-app.c b/src/shell-app.c
index 94b295171..60be10042 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -582,7 +582,7 @@ shell_app_activate_window (ShellApp     *app,
         {
           MetaWindow *other_window = iter->data;
 
-          if (other_window != window)
+          if (other_window != window && meta_window_get_workspace (other_window) == workspace)
             meta_window_raise (other_window);
         }
       g_slist_free (windows_reversed);