diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 30c7eff72c3..6b6f8fc349a 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-10  Joel Brobecker  <brobecker@adacore.com>
+
+	PR server/23158:
+	* win32-low.c (win32_create_inferior): Add call to my_wait
+	setting last_status global.
+
 2018-05-10  Joel Brobecker  <brobecker@adacore.com>
 
 	PR server/23158:
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index db5dd49eedf..7ed5fc5c0e7 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -704,6 +704,10 @@ win32_create_inferior (const char *program,
 
   do_initial_child_stuff (pi.hProcess, pi.dwProcessId, 0);
 
+  /* Wait till we are at 1st instruction in program, return new pid
+     (assuming success).  */
+  last_ptid = win32_wait (pid_to_ptid (current_process_id), &last_status, 0);
+
   return current_process_id;
 }