diff --git a/components/synedit/syngutter.pp b/components/synedit/syngutter.pp
index 1a4c6f0889..1e7d3dc91d 100644
--- a/components/synedit/syngutter.pp
+++ b/components/synedit/syngutter.pp
@@ -660,10 +660,12 @@ begin
   i := 0;
   x2 := x;
   while i < FGutterPartList.Count-1 do begin
-    if x2 >= GutterPart[i].Width then
-      x2 := x2 - GutterPart[i].Width
-    else
-      break;
+    if GutterPart[i].Visible then begin
+      if x2 >= GutterPart[i].Width then
+        x2 := x2 - GutterPart[i].Width
+      else
+        break;
+    end;
     inc(i)
   end;
   GutterPart[i].DoOnGutterClick(X, Y);
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 580ee5eadf..6bf57a5949 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -2070,16 +2070,13 @@ procedure TSourceEditor.OnGutterClick(Sender: TObject; X, Y, Line: integer;
 var
   BreakPtMark: TSourceMark;
 begin
-  if (not EditorComponent.Gutter.ShowCodeFolding)
-  or (X>=EditorComponent.Gutter.CodeFoldingWidth) then begin
-    // create or delete breakpoint
-    // find breakpoint mark at line
-    BreakPtMark := SourceEditorMarks.FindBreakPointMark(FEditor,Line);
-    if BreakPtMark = nil then
-      DebugBoss.DoCreateBreakPoint(Filename,Line,true)
-    else
-      DebugBoss.DoDeleteBreakPointAtMark(BreakPtMark);
-  end;
+  // create or delete breakpoint
+  // find breakpoint mark at line
+  BreakPtMark := SourceEditorMarks.FindBreakPointMark(FEditor,Line);
+  if BreakPtMark = nil then
+    DebugBoss.DoCreateBreakPoint(Filename,Line,true)
+  else
+    DebugBoss.DoDeleteBreakPointAtMark(BreakPtMark);
 end;
 
 procedure TSourceEditor.OnEditorSpecialLineColor(Sender: TObject; Line: integer;