diff --git a/.config/hypr/keybinds/binds.conf b/.config/hypr/keybinds/binds.conf
index 057010da..88cddeeb 100644
--- a/.config/hypr/keybinds/binds.conf
+++ b/.config/hypr/keybinds/binds.conf
@@ -56,7 +56,7 @@ bind=ALT,Insert,exec, ~/.config/hypr/scripts/rofi/screenshots_selection
 bind=SUPER,c,exec, cliphist list | rofi -dmenu -theme ~/.config/rofi/style.rasi | cliphist decode | wl-copy
 
 # Logout menu
-bind=SUPER, space, exec, wleave
+bind=SUPER, escape, exec, wleave
 
 # Color picker
 bind=SUPER,Insert,exec, ~/.config/hypr/scripts/color_picker
diff --git a/.config/hypr/themes/luna/luna.conf b/.config/hypr/themes/luna/luna.conf
index ebb76d3c..12ccd94e 100644
--- a/.config/hypr/themes/luna/luna.conf
+++ b/.config/hypr/themes/luna/luna.conf
@@ -2,7 +2,7 @@
 input {
     kb_layout=us,es
     kb_model=
-    kb_options=compose:rctrl,level3:ralt_switch
+    kb_options=compose:rctrl,level3:ralt_switch,grp:win_space_toggle
     kb_rules=
 
     follow_mouse=1
@@ -18,7 +18,7 @@ input {
 device:sonix-usb-device {
     kb_layout=es,us
     kb_model=
-    kb_options=compose:rctrl,level3:ralt_switch
+    kb_options=compose:rctrl,level3:ralt_switch,grp:win_space_toggle
     kb_rules=
 
     numlock_by_default=true
@@ -27,7 +27,7 @@ device:sonix-usb-device {
 device:evision-usb-device {
     kb_layout=us,es
     kb_model=
-    kb_options=compose:rctrl,level3:ralt_switch
+    kb_options=compose:rctrl,level3:ralt_switch,grp:win_space_toggle
     kb_rules=
 
     numlock_by_default=true