diff --git a/src/window.c b/src/window.c
index 5473aab..3f99681 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4873,7 +4873,10 @@
 	    dirname = curtab->tp_localdir;
 
 	if (mch_chdir((char *)dirname) == 0)
+	{
+	    last_chdir_reason = NULL;
 	    shorten_fnames(TRUE);
+	}
     }
     else if (globaldir != NULL)
     {
@@ -4881,6 +4884,7 @@
 	// directory: Change to the global directory.
 	vim_ignored = mch_chdir((char *)globaldir);
 	VIM_CLEAR(globaldir);
+	last_chdir_reason = NULL;
 	shorten_fnames(TRUE);
     }
 }