diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix
index 2ef6229..5f32898 100644
--- a/hosts/pinwheel/configuration.nix
+++ b/hosts/pinwheel/configuration.nix
@@ -20,6 +20,7 @@
       ./modules/hyprland
       ./modules/waybar
       ./modules/swaylock
+      ./modules/bemenu
       ./modules/syncthing
       ./modules/firefox
       ./modules/calibre 
diff --git a/hosts/pinwheel/home.nix b/hosts/pinwheel/home.nix
index 2e27fae..611e6ce 100644
--- a/hosts/pinwheel/home.nix
+++ b/hosts/pinwheel/home.nix
@@ -9,7 +9,6 @@
     emacs
     gnumake
     tig
-    bemenu
   ];
 
   services.dunst.enable = true;
diff --git a/hosts/pinwheel/modules/bemenu/default.nix b/hosts/pinwheel/modules/bemenu/default.nix
new file mode 100644
index 0000000..cfa4eae
--- /dev/null
+++ b/hosts/pinwheel/modules/bemenu/default.nix
@@ -0,0 +1,14 @@
+{ home-manager, pkgs, ... }:
+{
+  home-manager.users.alex = {
+    home.packages = [ pkgs.bemenu ];
+
+    wayland.windowManager.hyprland = {
+      settings = {
+        bind = [
+          "$mod, SPACE, exec, ${pkgs.bemenu}/bin/bemenu-run --fn 'DejaVuSansM Nerd Font Mono 14'"
+        ];
+      };
+    };
+  };
+}
diff --git a/hosts/pinwheel/modules/hyprland/default.nix b/hosts/pinwheel/modules/hyprland/default.nix
index ee9c844..e4045f0 100644
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -68,8 +68,6 @@
         select ++ move ++ [
           "$mod SHIFT, x, exec, systemctl suspend"
 
-          "$mod, SPACE, exec, bemenu-run --fn 'DejaVuSansM Nerd Font Mono 14'"
-
           "$mod, ESCAPE, killactive"
 
           "$mod, f, fullscreen, 1"