diff --git a/src/auto_tiler.ts b/src/auto_tiler.ts
index 7d233e13..45e99b1f 100644
--- a/src/auto_tiler.ts
+++ b/src/auto_tiler.ts
@@ -685,9 +685,9 @@ export class AutoTiler {
             return Err('focused window is not attached');
         }
 
-        return onto.workspace_id() == win.workspace_id()
+        return onto.meta.get_monitor() == win.meta.get_monitor() && onto.workspace_id() == win.workspace_id()
             ? Ok(onto)
-            : Err('window is not on the same workspace');
+            : Err('window is not on the same monitor or workspace');
     }
 
     private toggle_orientation_(ext: Ext, focused: ShellWindow): Result<void, string> {
diff --git a/src/extension.ts b/src/extension.ts
index 90038c83..ad38d770 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -2057,7 +2057,7 @@ export class Ext extends Ecs.System<ExtEvent> {
                 let actor = window.meta.get_compositor_private();
                 if (actor) {
                     if (!window.meta.minimized) {
-                        tiler.auto_tile(this, window, true);
+                        tiler.auto_tile(this, window, false);
                     }
                 }
             }