diff --git a/komorebi/src/monitor.rs b/komorebi/src/monitor.rs
index cf10646a..1ecd1d13 100644
--- a/komorebi/src/monitor.rs
+++ b/komorebi/src/monitor.rs
@@ -17,6 +17,7 @@ use crate::core::Rect;
 use crate::container::Container;
 use crate::ring::Ring;
 use crate::workspace::Workspace;
+use crate::workspace::WorkspaceLayer;
 use crate::DefaultLayout;
 use crate::Layout;
 use crate::OperationDirection;
@@ -382,6 +383,7 @@ impl Monitor {
             };
 
             target_workspace.floating_windows_mut().push(window);
+            target_workspace.set_layer(WorkspaceLayer::Floating);
         } else {
             let container = workspace
                 .remove_focused_container()
@@ -398,6 +400,8 @@ impl Monitor {
                 Some(workspace) => workspace,
             };
 
+            target_workspace.set_layer(WorkspaceLayer::Tiling);
+
             if let Some(direction) = direction {
                 self.add_container_with_direction(
                     container,
diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs
index c20b20b7..d78c47f3 100644
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -1854,6 +1854,7 @@ impl WindowManager {
 
         if let Some(window) = floating_window {
             target_workspace.floating_windows_mut().push(window);
+            target_workspace.set_layer(WorkspaceLayer::Floating);
             Window::from(window.hwnd)
                 .move_to_area(&current_area, target_monitor.work_area_size())?;
         } else if let Some(container) = container {
@@ -1863,6 +1864,8 @@ impl WindowManager {
                 .map(|w| w.hwnd)
                 .collect::<Vec<_>>();
 
+            target_workspace.set_layer(WorkspaceLayer::Tiling);
+
             if let Some(direction) = move_direction {
                 target_monitor.add_container_with_direction(container, workspace_idx, direction)?;
             } else {