diff --git a/src/apps/debugger/model/Thread.cpp b/src/apps/debugger/model/Thread.cpp
index a52c6e1600..fc74ea0f67 100644
--- a/src/apps/debugger/model/Thread.cpp
+++ b/src/apps/debugger/model/Thread.cpp
@@ -19,6 +19,7 @@ Thread::Thread(Team* team, thread_id threadID)
 	fID(threadID),
 	fState(THREAD_STATE_UNKNOWN),
 	fReturnValueInfos(NULL),
+	fStopRequestPending(false),
 	fStoppedReason(THREAD_STOPPED_UNKNOWN),
 	fCpuState(NULL),
 	fStackTrace(NULL)
@@ -78,6 +79,7 @@ Thread::SetState(uint32 state, uint32 reason, const BString& info)
 		SetCpuState(NULL);
 		SetStackTrace(NULL);
 		ClearReturnValueInfos();
+		fStopRequestPending = false;
 	}
 
 	fTeam->NotifyThreadStateChanged(this);
@@ -119,6 +121,12 @@ Thread::SetStackTrace(StackTrace* trace)
 	fTeam->NotifyThreadStackTraceChanged(this);
 }
 
+void
+Thread::SetStopRequestPending()
+{
+	fStopRequestPending = true;
+}
+
 
 status_t
 Thread::AddReturnValueInfo(ReturnValueInfo* info)
diff --git a/src/apps/debugger/model/Thread.h b/src/apps/debugger/model/Thread.h
index 9f936c7822..8cfe3be537 100644
--- a/src/apps/debugger/model/Thread.h
+++ b/src/apps/debugger/model/Thread.h
@@ -71,6 +71,10 @@ public:
 			StackTrace*			GetStackTrace() const	{ return fStackTrace; }
 			void				SetStackTrace(StackTrace* trace);
 
+			bool				StopRequestPending() const
+									{ return fStopRequestPending; }
+			void				SetStopRequestPending();
+
 			ReturnValueInfoList*
 								ReturnValueInfos() const
 								{ return fReturnValueInfos; }
@@ -84,6 +88,7 @@ private:
 			uint32				fState;
 			ReturnValueInfoList*
 								fReturnValueInfos;
+			bool				fStopRequestPending;
 			uint32				fStoppedReason;
 			BString				fStoppedReasonInfo;
 			CpuState*			fCpuState;