diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index e617f4ad..778e27d8 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -227,11 +227,12 @@
             # See https://wiki.hyprland.org/Configuring/Keywords/ for more
             "SUPER, F1, exec, ${swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse"
             "SUPER, Q, killactive,"
-            "SUPER SHIFT, Q, exec, ${rofi.finalPackage}/bin/rofi -replace -show power-menu"
+            "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, 0"
             "SUPER SHIFT, M, fullscreen, 1"
-            "SUPER, tab, exec, ${rofi.finalPackage}/bin/rofi -replace -show window"
+            "SUPER, tab, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show window"
+            "SUPER, F, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show filebrowser"
             "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"
@@ -239,7 +240,7 @@
             "SUPER SHIFT, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw"
 
             # Common program shortcuts
-            "SUPER, Space, exec, ${rofi.finalPackage}/bin/rofi -replace -show combi"
+            "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, S, exec, ${alacritty.package}/bin/alacritty -e btm --group --battery"
@@ -247,7 +248,7 @@
 
             # Misc useful binds
             '',Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"''
-            ",XF86Calculator,exec,${rofi.finalPackage}/bin/rofi -replace -show calc"
+            ",XF86Calculator,exec,pkill rofi || ${rofi.finalPackage}/bin/rofi -show calc"
 
             # Movement binds
             "SUPER, H, movefocus, l"
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index 1eff2bd3..dcbba614 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -13,10 +13,8 @@
         USERNAME_field='login'
       '';
     };
-    extraConfig = let
-      power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
-    in {
-      modi = "window,run,drun,ssh,${power-menu},combi";
+    extraConfig = {
+      modi = "window,drun,filebrowser,ssh,combi";
       combi-modi = "window,drun,ssh";
       sidebar-mode = true;
       sort = true;
@@ -31,9 +29,9 @@
       display-window = " 󰧨  Move ";
       display-run = " 󰅴  Run ";
       display-drun = " 󱓞  Apps ";
+      display-filebrowser = " 󰝰  Files ";
       display-ssh = " 󰢹  SSH ";
       display-combi = " 󰛡  Combi ";
-      display-power-menu = " 󰐥  Power ";
     };
     theme = with config.lib.stylix.colors; let
       inherit (config.lib.formats.rasi) mkLiteral;