diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
index 6dd1633642..f1e13ca554 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
@@ -115,6 +115,20 @@ namespace Debugger
 			isProcessRunning = false;
 			debugger.PauseSession = new PauseSession(PausedReason.Break);
 			debugger.SelectedProcess = this;
+			
+			if (this.SelectedThread == null && this.Threads.Count > 0) {
+				this.SelectedThread = this.Threads[0];
+			}
+			
+			if (debugger.SelectedThread != null) {
+				// Disable all steppers - do not Deactivate since function tracking still needs them
+				foreach(Stepper s in debugger.SelectedThread.Steppers) {
+					s.PauseWhenComplete = false;
+				}
+				
+				debugger.SelectedThread.SelectedFunction = debugger.SelectedThread.LastFunctionWithLoadedSymbols;
+			}
+			
 			debugger.Pause();
 		}