diff --git a/src/core/place.c b/src/core/place.c
index fcb2f69cd..70171cb05 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -847,10 +847,9 @@ meta_window_place (MetaWindow        *window,
       {
         MetaWindow *w = tmp->data;
 
-        if (meta_window_showing_on_its_workspace (w) &&
-            w != window && 
-            (window->workspace == w->workspace ||
-             window->on_all_workspaces || w->on_all_workspaces))
+        if (w != window &&
+            meta_window_showing_on_its_workspace (w) &&
+            meta_window_located_on_workspace (w, window->workspace))
           windows = g_list_prepend (windows, w);
 
         tmp = tmp->next;
diff --git a/src/core/window.c b/src/core/window.c
index 87a6197d1..83255e06d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -10129,9 +10129,7 @@ meta_window_set_demands_attention (MetaWindow *window)
           other_window = stack->data;
           stack = stack->next;
 
-          if (other_window->on_all_workspaces ||
-              window->on_all_workspaces ||
-              other_window->workspace == window->workspace)
+          if (meta_window_located_on_workspace (other_window, window->workspace))
             {
               meta_window_get_outer_rect (other_window, &other_rect);
 
diff --git a/src/core/workspace.c b/src/core/workspace.c
index 0ab52a697..62a04d2c6 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -1292,8 +1292,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
       ancestor = NULL;
       meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
       if (ancestor != NULL &&
-          (ancestor->on_all_workspaces ||
-           ancestor->workspace == workspace) &&
+          meta_window_located_on_workspace (ancestor, workspace) &&
           meta_window_showing_on_its_workspace (ancestor))
         {
           meta_topic (META_DEBUG_FOCUS,