diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 811187b1..329dfc6d 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -2750,6 +2750,21 @@ impl Shell {
                         );
                         from_workspace.refresh_focus_stack();
                         to_workspace.refresh_focus_stack();
+
+                        if !to_workspace.tiling_enabled {
+                            to_workspace.tiling_enabled = true;
+                            for mapped in to_workspace
+                                .tiling_layer
+                                .mapped()
+                                .map(|(mapped, _)| mapped.clone())
+                                .collect::<Vec<_>>()
+                                .into_iter()
+                            {
+                                to_workspace.toggle_floating_window(&seat, &mapped);
+                            }
+                            to_workspace.tiling_enabled = false;
+                        }
+
                         return Ok(res.zip(new_pos));
                     }
                 }