diff --git a/cli/fish/config.fish b/cli/fish/config.fish
index 3f00e68..d0c404d 100644
--- a/cli/fish/config.fish
+++ b/cli/fish/config.fish
@@ -79,7 +79,7 @@ if status is-interactive
         ~/.profile.fish
 
     # === auto cd into last activated directory
-    test "$PWD" = "$HOME" && cd $last_pwd
+    test "$PWD" = "$HOME" && test -d $last_pwd && cd $last_pwd
 
     function loadenv
         while read -l line