diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class
index b7b87e5c9..104948084 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.class
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.class
@@ -1088,6 +1088,21 @@ Public Sub RefreshBreakpointView()
   
 End
 
+Public Sub RemoveAllBreakpoints()
+  
+  Dim aBreakPoint As String[]
+  Dim I As Integer
+  
+  aBreakpoint = Design.GetBreakpoints()
+  While aBreakpoint.Count
+    Design.SetBreakpoint(aBreakpoint[0], False)
+  Wend
+  
+  RefreshBreakpointView
+  
+End
+
+
 Public Sub btnRemoveBreakpoint_Click()
   
   Dim aBreakPoint As String[]
@@ -1130,9 +1145,7 @@ End
 Public Sub btnRemoveAllBreakpoint_Click()
   
   If Project.Running Then Return
-  
-  gvwBreakpoint.SelectAll
-  btnRemoveBreakpoint_Click
+  RemoveAllBreakpoints
   
 End
 
diff --git a/app/src/gambas3/.src/FMain.class b/app/src/gambas3/.src/FMain.class
index 67d799da0..722af9b16 100644
--- a/app/src/gambas3/.src/FMain.class
+++ b/app/src/gambas3/.src/FMain.class
@@ -1869,7 +1869,7 @@ End
 
 Public Sub mnuClearBreakpoints_Click()
   
-  Design.ClearBreakpoints
+  FDebugInfo.RemoveAllBreakpoints
   
 End