diff --git a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
index 57b43cd994d..df7f182bce9 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
@@ -66,7 +66,10 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 		this.toDispose.push(this.debugService.getViewModel().onDidFocusStackFrame(() => this.onFocusStackFrame()));
 		this.toDispose.push(this.debugService.onDidChangeState(() => {
 			if (this.debugService.state === State.Inactive) {
-				this.modelDataMap.forEach(modelData => modelData.dirty = false);
+				this.modelDataMap.forEach(modelData => {
+					modelData.dirty = false;
+					modelData.topStackFrameLine = undefined;
+				});
 			}
 		}));
 	}