diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 5a80a07..3e40669 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8753,8 +8753,8 @@
 		else if (*dirnow != NUL
 			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
 		{
-		    (void)mch_chdir((char *)globaldir);
-		    shorten_fnames(TRUE);
+		    if (mch_chdir((char *)globaldir) == OK)
+			shorten_fnames(TRUE);
 		}
 
 		failed |= (makeopens(fd, dirnow) == FAIL);