diff --git a/home/qenya/zsh.nix b/home/qenya/zsh.nix
index f6ded78..42ccf8f 100644
--- a/home/qenya/zsh.nix
+++ b/home/qenya/zsh.nix
@@ -25,6 +25,15 @@
       theme = "agnoster";
     };
 
+    initExtra = ''
+      # If a shell is started in a directory with a shell.nix, automatically run nix-shell
+      if [ -f ./shell.nix ]; then
+        if [ -z "$IN_NIX_SHELL" ]; then
+          nix-shell --command "zsh"
+        fi
+      fi
+    '';
+
     envExtra = ''
       DEFAULT_USER=qenya
     '';