diff --git a/src/vs/workbench/parts/debug/common/debugViewModel.ts b/src/vs/workbench/parts/debug/common/debugViewModel.ts
index efb8ee269307fa01864154fca335d6e9fbe0d8bf..b2d6e7b6d894580940814d3afad9201fcb041a53 100644
--- a/src/vs/workbench/parts/debug/common/debugViewModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugViewModel.ts
@@ -61,14 +61,14 @@ export class ViewModel implements IViewModel {
 	}
 
 	setFocus(stackFrame: IStackFrame, thread: IThread, session: ISession, explicit: boolean): void {
-		let shouldEmit = this._focusedSession !== session || this._focusedThread !== thread || this._focusedStackFrame !== stackFrame;
+		const shouldEmit = this._focusedSession !== session || this._focusedThread !== thread || this._focusedStackFrame !== stackFrame;
 
+		this._focusedStackFrame = stackFrame;
+		this._focusedThread = thread;
 		if (this._focusedSession !== session) {
 			this._focusedSession = session;
 			this._onDidFocusSession.fire(session);
 		}
-		this._focusedThread = thread;
-		this._focusedStackFrame = stackFrame;
 
 		this.loadedScriptsSupportedContextKey.set(session && session.raw.capabilities.supportsLoadedSourcesRequest);