diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 621f4f58082..838c685a828 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-01  Pedro Alves  <palves@redhat.com>
+
+	* linux-nat.c (linux_handle_extended_wait): Always call set_running.
+
 2015-04-01  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* MAINTAINERS (Write After Approval): Add "Pierre-Marie de Rodat".
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 0376299fb19..04707dc68a3 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -2109,9 +2109,12 @@ linux_handle_extended_wait (struct lwp_info *lp, int status,
 	      add_thread (new_lp->ptid);
 	    }
 
+	  /* Even if we're stopping the thread for some reason
+	     internal to this module, from the user/frontend's
+	     perspective, this new thread is running.  */
+	  set_running (new_lp->ptid, 1);
 	  if (!stopping)
 	    {
-	      set_running (new_lp->ptid, 1);
 	      set_executing (new_lp->ptid, 1);
 	      /* thread_db_attach_lwp -> lin_lwp_attach_lwp forced
 		 resume_stop.  */