diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 295cbf41b0f6e..aad8c7e6944a2 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -711,11 +711,18 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
 	if (focusedThread) {
 		const callStack = focusedThread ? focusedThread.getCallStack() : undefined;
 		const topStackFrame = callStack ? callStack[0] : undefined;
-		if (topStackFrame && topStackFrame.source.uri.toString() === breakpoint.uri.toString() && topStackFrame.range.startLineNumber === breakpoint.lineNumber && topStackFrame.range.startColumn === breakpoint.column) {
-			return {
-				className: 'debug-breakpoint-and-top-stack-frame',
-				message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
-			};
+		if (topStackFrame && topStackFrame.source.uri.toString() === breakpoint.uri.toString() && topStackFrame.range.startLineNumber === breakpoint.lineNumber) {
+			if (topStackFrame.range.startColumn === breakpoint.column) {
+				return {
+					className: 'debug-breakpoint-and-top-stack-frame-at-column',
+					message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
+				};
+			} else if (breakpoint.column === undefined) {
+				return {
+					className: 'debug-breakpoint-and-top-stack-frame',
+					message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
+				};
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
index bdee92f212891..3ab961601acd8 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
@@ -119,7 +119,8 @@
 	background: url('breakpoint-unsupported.svg') center center no-repeat;
 }
 
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-and-top-stack-frame {
+.monaco-editor .debug-top-stack-frame.debug-breakpoint-and-top-stack-frame,
+.monaco-editor .inline-breakpoint-widget.debug-breakpoint-and-top-stack-frame-at-column {
 	background: url('current-and-breakpoint.svg') center center no-repeat;
 }