diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index d0b7d6a5..e2746d2b 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -257,21 +257,24 @@
             "SUPER, V, togglefloating"
             "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"
-
             # Common program shortcuts
-            "SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show combi"
             "SUPER, Return, exec, ${alacritty.package}/bin/alacritty"
             "SUPER, E, exec, ${emacs.finalPackage}/bin/emacsclient -c"
             "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt --no-socket"
 
+            # Rofi binds
+            "SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show drun"
+            "SUPER, tab, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show window"
+            "SUPER SHIFT, Return, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show ssh"
+
+            # 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"
+
             # Terminal utilities
             "SUPER, S, exec, ${withTerm {
               progname = "btm";
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index dfc68353..474107b1 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   accentColour,
   ...
 }: {
@@ -15,7 +14,7 @@
       '';
     };
     extraConfig = {
-      modi = "combi,drun,ssh,window";
+      modi = "drun,ssh,window,combi";
       combi-modi = "window,drun,ssh";
       sidebar-mode = true;
       sort = true;