diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs
index bbebd2f0..d5c93812 100644
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -1662,6 +1662,15 @@ impl WindowManager {
 
         let workspace = self.focused_workspace_mut()?;
 
+        // don't flip on Grid layout
+        match workspace.layout() {
+            Layout::Default(layout) => match layout {
+                DefaultLayout::Grid => return Ok(()),
+                _ => (),
+            },
+            _ => (),
+        }
+
         #[allow(clippy::match_same_arms)]
         match workspace.layout_flip() {
             None => {