diff --git a/config/darwin.nix b/config/darwin.nix
index b4a26e8..fd396c1 100644
--- a/config/darwin.nix
+++ b/config/darwin.nix
@@ -140,6 +140,8 @@
     };
 
     extraConfig = ''
+    yabai -m signal --add event=window_destroyed action="yabai -m query --windows --window &> /dev/null || yabai -m window --focus mouse"
+    yabai -m signal --add event=application_terminated action="yabai -m query --windows --window &> /dev/null || yabai -m window --focus mouse"
     yabai -m rule --add app="^System Settings$" manage=off
     yabai -m rule --add app="^Calculator$" manage=off
     '';
diff --git a/home/zsh.nix b/home/zsh.nix
index 94ce3a1..d78417a 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -40,6 +40,10 @@
     function ....... { cd ../../../../../../.. }
     function bw-copy { bw-load && bw get password "$1" | xsel --clipboard -i }
     function bw-clear { echo -n "" | xsel --clipboard }
+
+    if [[ "$(uname)" == "Darwin" ]]; then
+       source <(/opt/homebrew/bin/brew shellenv)
+    fi
     '';
 
     plugins = [