diff --git a/ChangeLog b/ChangeLog
index aab3ccd01ee214b9b93a68e0324345cc0bcc738d..c143bb5320e726aa9a2e7d4e164093fd4b9dda33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@ CVS code -
 	- Rework input parsing in the file browser to be more flexible.
 	  New function parse_browser_input(); changes to do_browser().
 	  (DLR)
+- browser.c:
+  do_browser()
+	- Properly set currshortcut back to the file browser shortcut
+	  list after a "Go To Directory" prompt. (DLR)
 - chars.c:
   mbstrchr()
 	- Make parameter c const. (DLR)
diff --git a/src/browser.c b/src/browser.c
index 1065e1c1f49436fe0dc8de91c45109f4353f4ed8..6ad387714ced3e5d26927755dc0a453cf2a1a535 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -42,14 +42,12 @@ char *do_browser(char *path, DIR *dir)
 
     curs_set(0);
     blank_statusbar();
-    bottombars(browser_list);
-    wnoutrefresh(bottomwin);
 
 #if !defined(DISABLE_HELP) || !defined(DISABLE_MOUSE)
-    /* Set currshortcut so the user can click in the shortcut area, and
-     * so the browser help screen will come up. */
     currshortcut = browser_list;
 #endif
+    bottombars(browser_list);
+    wnoutrefresh(bottomwin);
 
     UNSET(CONST_UPDATE);
 
@@ -242,6 +240,9 @@ char *do_browser(char *path, DIR *dir)
 			_("Go To Directory"));
 
 		curs_set(0);
+#if !defined(DISABLE_HELP) || !defined(DISABLE_MOUSE)
+		currshortcut = browser_list;
+#endif
 		bottombars(browser_list);
 
 		if (j < 0) {