diff --git a/config/hypr/hyprland/modal-binds/device.conf b/config/hypr/hyprland/modal-binds/device.conf
index bc7098e..f7a67e5 100644
--- a/config/hypr/hyprland/modal-binds/device.conf
+++ b/config/hypr/hyprland/modal-binds/device.conf
@@ -20,10 +20,8 @@ submap = device
 
 
 # ── Swapescape ──────────────────────────────────────────────────────
-bind = , ., exec, hyprctl keyword input:kb_options "caps:swapescape"
-bind = , ., exec, submap, reset
-bind = , :, exec, hyprctl keyword input:kb_options ""
-bind = , :, exec, submap, reset
+bind = , S, exec, fish -c "toggle-swapescape"
+bind = , S, submap, reset
 
 
 # ── FPV goggles binds ───────────────────────────────────────────────
diff --git a/scripts/toggle-swapescape b/scripts/toggle-swapescape
new file mode 100755
index 0000000..e20f3d4
--- /dev/null
+++ b/scripts/toggle-swapescape
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+enabled=$(hyprctl getoption input:kb_options | grep "caps:swapescape")
+if [[ $enabled == "" ]]; then
+    hyprctl keyword input:kb_options "caps:swapescape"
+    notify-send "Swapescape enabled"
+else
+    hyprctl keyword input:kb_options ""
+    notify-send "Swapescape disabled"
+fi