diff --git a/bin/omarchy-hyprland-window-gaps-toggle b/bin/omarchy-hyprland-window-gaps-toggle
index d2cf2ffd..7b93530c 100755
--- a/bin/omarchy-hyprland-window-gaps-toggle
+++ b/bin/omarchy-hyprland-window-gaps-toggle
@@ -1,15 +1,5 @@
 #!/bin/bash
 
-# Toggles the window gaps globally between no gaps and the default 10/5/2.
+# Toggles the window gaps globally between no gaps and the default.
 
-gaps=$(hyprctl getoption general:gaps_out -j | jq -r '.custom' | awk '{print $1}')
-
-if [[ $gaps == "0" ]]; then
-  hyprctl keyword general:gaps_out 10
-  hyprctl keyword general:gaps_in 5
-  hyprctl keyword general:border_size 2
-else
-  hyprctl keyword general:gaps_out 0
-  hyprctl keyword general:gaps_in 0
-  hyprctl keyword general:border_size 0
-fi
+omarchy-hyprland-flag-toggle window-no-gaps
diff --git a/default/hypr/flags/window-no-gaps.conf b/default/hypr/flags/window-no-gaps.conf
new file mode 100644
index 00000000..a9b6c578
--- /dev/null
+++ b/default/hypr/flags/window-no-gaps.conf
@@ -0,0 +1,6 @@
+# Remove all window gaps and borders
+general {
+    gaps_out = 0
+    gaps_in = 0
+    border_size = 0
+}