diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 4e7c169..bf03721 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3485,7 +3485,7 @@
 	foldUpdateAll(curwin);
 #endif
 
-#if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
+#ifdef FEAT_AUTOCHDIR
 	if (p_acd && curbuf->b_ffname != NULL
 				     && vim_chdirfile(curbuf->b_ffname) == OK)
 	    shorten_fnames(TRUE);
@@ -3656,12 +3656,14 @@
     if (p_im)
 	need_start_insertmode = TRUE;
 
-#if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
+#ifdef FEAT_AUTOCHDIR
     /* Change directories when the acd option is set on. */
     if (p_acd && curbuf->b_ffname != NULL
 				     && vim_chdirfile(curbuf->b_ffname) == OK)
 	shorten_fnames(TRUE);
+#endif
 
+#if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
     if (gui.in_use && curbuf->b_ffname != NULL)
     {
 # ifdef FEAT_SUN_WORKSHOP