diff --git a/src/DesktopIntegration.vala b/src/DesktopIntegration.vala
index a186b2928..56347641c 100644
--- a/src/DesktopIntegration.vala
+++ b/src/DesktopIntegration.vala
@@ -78,10 +78,6 @@ public class Gala.DesktopIntegration : GLib.Object {
             return false;
         }
 
-        if (ShellClientsManager.get_instance ().is_positioned_window (window)) {
-            return false;
-        }
-
         switch (window.get_window_type ()) {
             case Meta.WindowType.NORMAL:
             case Meta.WindowType.DIALOG:
diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala
index 726395656..34921eed5 100644
--- a/src/InternalUtils.vala
+++ b/src/InternalUtils.vala
@@ -210,17 +210,19 @@ namespace Gala {
             });
 
             foreach (var window in list) {
-                if (!ShellClientsManager.get_instance ().is_positioned_window (window)) {
-                    if (any_window == null) {
-                        any_window = window;
-                    }
+                if (window.find_root_ancestor ().window_type == DOCK) {
+                    continue;
+                }
 
-                    if (!Utils.get_window_is_normal (window)) {
-                        continue;
-                    }
+                if (any_window == null) {
+                    any_window = window;
+                }
 
-                    return window;
+                if (!Utils.get_window_is_normal (window)) {
+                    continue;
                 }
+
+                return window;
             }
 
             return null;
diff --git a/src/WindowStateSaver.vala b/src/WindowStateSaver.vala
index d5ae4df7a..08d304c1b 100644
--- a/src/WindowStateSaver.vala
+++ b/src/WindowStateSaver.vala
@@ -79,7 +79,6 @@ public class Gala.WindowStateSaver : GLib.Object {
         var app_id = window_tracker.get_app_for_window (window).id;
 
         if (app_id.has_prefix ("window:") || // if window failed to be identified, don't remember it
-            ShellClientsManager.get_instance ().is_positioned_window (window) ||
             window.window_type != Meta.WindowType.NORMAL ||
             window.skip_taskbar ||
             !window.resizeable ||