diff --git a/fish/config/config.fish b/fish/config/config.fish
index d5100ce..a22fdd9 100644
--- a/fish/config/config.fish
+++ b/fish/config/config.fish
@@ -130,3 +130,5 @@ alias iscp='scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"'
 
 
 source-file-if-exists ~/.profile.fish
+
+status is-interactive && cd $last_pwd
diff --git a/fish/config/functions/fish_prompt.fish b/fish/config/functions/fish_prompt.fish
index e254949..0b479b7 100644
--- a/fish/config/functions/fish_prompt.fish
+++ b/fish/config/functions/fish_prompt.fish
@@ -2,7 +2,8 @@ set -g __fish_git_prompt_show_informative_status 1
 
 # Defined in /tmp/fish.hyt5lE/fish_prompt.fish @ line 2
 function fish_prompt --description 'Write out the prompt'
-	set -l color_cwd
+    set -U last_pwd $PWD
+    set -l color_cwd
     set -l suffix
     switch "$USER"
         case root toor