diff --git a/src/WorkspaceManager.vala b/src/WorkspaceManager.vala
index b3ee12bda..a86479b36 100644
--- a/src/WorkspaceManager.vala
+++ b/src/WorkspaceManager.vala
@@ -113,7 +113,12 @@ public class Gala.WorkspaceManager : Object {
         foreach (var actor in window_actors) {
             var win = actor.meta_window;
 
-            if (win == null || win.on_all_workspaces || win.get_workspace () == null) {
+            if (
+                win == null ||
+                win.on_all_workspaces ||
+                Meta.Prefs.get_workspaces_only_on_primary () && !win.is_on_primary_monitor () ||
+                win.get_workspace () == null
+            ) {
                 continue;
             }