diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index d2c9ff77..d0b7d6a5 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -255,19 +255,21 @@
             "SUPER, Q, killactive,"
             "SUPER SHIFT, Q, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show powermenu -modi powermenu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
             "SUPER, V, togglefloating"
-            "SUPER, M, fullscreen, 1"
-            "SUPER SHIFT, M, fullscreen, 0"
+            "SUPER, F, fullscreen, 0" # Actual fullscreen
+            "SUPER, M, fullscreen, 1" # Maximise window
             "SUPER, tab, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show window"
+            "SUPER, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw"
+            "SUPER SHIFT, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw"
+
+            # Configure rofi-pass binds
             "SUPER, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass"
             "SUPER SHIFT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --last-used"
             "SUPER ALT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --insert"
-            "SUPER, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw"
-            "SUPER SHIFT, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw"
 
             # Common program shortcuts
             "SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show combi"
             "SUPER, Return, exec, ${alacritty.package}/bin/alacritty"
-            "SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c"
+            "SUPER, E, exec, ${emacs.finalPackage}/bin/emacsclient -c"
             "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt --no-socket"
 
             # Terminal utilities