diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2f2958c599b..487a5783882 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-27  Hannes Domani  <ssbssa@yahoo.de>
+
+	* cli/cli-cmds.c (shell_escape): Move exit_status_set_internal_vars.
+
 2020-05-27  Hannes Domani  <ssbssa@yahoo.de>
 
 	* exec.c (exec_file_attach): Use errno value of first openp failure.
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index fdc8758bcd0..cd6f7856599 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -830,8 +830,8 @@ shell_escape (const char *arg, int from_tty)
   /* Make sure to return to the directory GDB thinks it is, in case
      the shell command we just ran changed it.  */
   chdir (current_directory);
-  exit_status_set_internal_vars (rc);
 #endif
+  exit_status_set_internal_vars (rc);
 #else /* Can fork.  */
   int status, pid;