diff --git a/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp b/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp
index ba4b0312ca..6b88b6316d 100644
--- a/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp
@@ -380,6 +380,9 @@ BreakpointListView::UnsetListener()
 void
 BreakpointListView::UserBreakpointChanged(UserBreakpoint* breakpoint)
 {
+	if (breakpoint->IsHidden())
+		return;
+
 	BreakpointProxy proxy(breakpoint, NULL);
 	fBreakpointsTableModel->UpdateBreakpoint(&proxy);
 }
diff --git a/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp b/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
index b6c6d9bacf..e88c9f840b 100644
--- a/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
@@ -686,6 +686,8 @@ SourceView::MarkerManager::_UpdateBreakpointMarkers()
 
 		for (int32 i = 0; UserBreakpoint* breakpoint = breakpoints.ItemAt(i);
 				i++) {
+			if (breakpoint->IsHidden())
+				continue;
 			UserBreakpointInstance* breakpointInstance
 				= breakpoint->InstanceAt(0);
 			FunctionInstance* functionInstance;