diff --git a/ide/packages/idedebugger/breakpointgroupframe.pas b/ide/packages/idedebugger/breakpointgroupframe.pas
index ed6ff4cb60..76cf932a0a 100644
--- a/ide/packages/idedebugger/breakpointgroupframe.pas
+++ b/ide/packages/idedebugger/breakpointgroupframe.pas
@@ -362,6 +362,8 @@ begin
     HasDisabled := HasDisabled or not b.Enabled;
   end;
 
+  ToolButtonDivider1.Visible := GroupKind in [bgfUngrouped, bgfGroup];
+
   ToolButtonEnableAll.Visible := GroupKind in [bgfUngrouped, bgfGroup];
   ToolButtonEnableAll.Enabled := (Count > 0) and HasDisabled;
 
diff --git a/ide/packages/idedebugger/breakpointsdlg.pp b/ide/packages/idedebugger/breakpointsdlg.pp
index 4fe50e4ccd..f2724eb01b 100644
--- a/ide/packages/idedebugger/breakpointsdlg.pp
+++ b/ide/packages/idedebugger/breakpointsdlg.pp
@@ -1231,7 +1231,8 @@ end;
 procedure TBreakPointsDlg.tvBreakPointsStartDrag(Sender: TObject;
   var DragObject: TDragObject);
 begin
-  FAddGroupedHeader.Visible := True;
+  if tbGroupByBrkGroup.Down then
+    FAddGroupedHeader.Visible := True;
   FDraggingGroupHeader := False;
 end;
 
@@ -1536,7 +1537,7 @@ begin
           tvBreakPoints.DeleteNode(LastAbandoned);
           LastAbandoned := nil;
         end;
-        if GrpHeader.GroupKind = bgfGroup then
+        if GrpHeader.GroupKind in [bgfGroup, bgfUngrouped] then
           GrpHeader.Visible := tbGroupByBrkGroup.Down;
         if GrpHeader.GroupKind = bgfAbandoned then
           LastAbandoned := VNode;