diff --git a/overlays/default.nix b/overlays/default.nix
index 8c1caf3..e1b2b95 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -16,6 +16,13 @@
         demoji = inputs.demoji.packages.${system}.demoji;
         devenv = inputs.devenv.packages.${system}.devenv;
         mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
+
+        bemenu = prev.bemenu.overrideAttrs (o: {
+            preBuild = ''
+                sed -i 's/ZWLR_LAYER_SHELL_V1_LAYER_TOP/ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY/g' lib/renderers/wayland/window.c
+            '';
+        });
+
         sea-orm-cli =
           inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli;
         webcord = inputs.webcord.legacyPackages.${prev.system}.webcord;
diff --git a/scripts/bmenu b/scripts/bmenu
index 11e3742..a422ca1 100644
--- a/scripts/bmenu
+++ b/scripts/bmenu
@@ -19,11 +19,6 @@ if test "$argv[1]" = "run"
 end
 
 if test -n "$SWAYSOCK"
-    swaymsg -t get_tree |
-        jq -je '..|select(.focused? and .fullscreen_mode? == 1)|""' &&
-        swaymsg -q fullscreen off &&
-        set fullscreen
-
     swaymsg -t get_outputs |
         jq -r 'map(.focused)|reverse|index(true)' |
         read focused_output
@@ -32,19 +27,12 @@ if test -n "$SWAYSOCK"
     and set focused_output "-m $focused_output"
 end
 
-function clean_exit
-    set -q fullscreen
-    and swaymsg -q fullscreen on &
-end
-
-trap clean_exit EXIT
-
 set -l config "$HOME/.config/bmenu.conf"
 if test -f $config
   source $config
 end
 
-dhist wrap -- bemenu \
+exec dhist wrap -- bemenu \
     $focused_output\
     --ignorecase\
     --bottom\
diff --git a/scripts/default.nix b/scripts/default.nix
index c4d8252..06a3a42 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -20,7 +20,7 @@
       lib.mapAttrs (name: deps: create_script name ./${name} deps);
   in create_scripts {
     br = [ ];
-    bmenu = [ bemenu final.dhist fish j4-dmenu-desktop jq sway ];
+    bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
     _diffr = [ diffr ];
     _thunar-terminal = [ final.terminal ];
     kak-pager = [ fish final._diffr ];