diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp
index 679f10feba..08f9d47304 100644
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@@ -2519,9 +2519,10 @@ begin
             break;
           end;
         end;
-      end; //for
+      end;
     end;
     if Assigned(fOnGutterClick) then begin
+      // for compatibility invoke this only on the markable area
       fOnGutterClick(Self, X, Y, line, mark);
     end;
   end;
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index f1b3c95ebd..44d92a2e9c 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -1738,13 +1738,16 @@ procedure TSourceEditor.OnGutterClick(Sender: TObject; X, Y, Line: integer;
 var
   BreakPtMark: TSourceMark;
 begin
-  // create or delete breakpoint
-  // find breakpoint mark at line
-  BreakPtMark := SourceEditorMarks.FindBreakPointMark(FEditor,Line);
-  if BreakPtMark = nil then
-    DebugBoss.DoCreateBreakPoint(Filename,Line)
-  else
-    DebugBoss.DoDeleteBreakPointAtMark(BreakPtMark);
+  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)
+    else
+      DebugBoss.DoDeleteBreakPointAtMark(BreakPtMark);
+  end;
 end;
 
 procedure TSourceEditor.OnEditorSpecialLineColor(Sender: TObject; Line: integer;