diff --git a/lcl/interfaces/cocoa/cocoagdiobjects.pas b/lcl/interfaces/cocoa/cocoagdiobjects.pas
index 9cf69b89ce..52e4aa69f1 100644
--- a/lcl/interfaces/cocoa/cocoagdiobjects.pas
+++ b/lcl/interfaces/cocoa/cocoagdiobjects.pas
@@ -386,6 +386,7 @@ type
     procedure ClearClipping;
   public
     ctx: NSGraphicsContext;
+    isControlDC: Boolean; // control DCs should never be freed by ReleaseDC as the control will free it by itself
     constructor Create(AGraphicsContext: NSGraphicsContext); virtual;
     destructor Destroy; override;
 
@@ -1942,11 +1943,13 @@ end;
 procedure TCocoaContext.ClearClipping;
 var
   Trans: CGAffineTransform;
+  cgc: CGContextRef;
 begin
   if FClipped then
   begin
-    Trans := CGContextGetCTM(CGContext);
-    CGContextRestoreGState(CGContext());
+    cgc := CGContext();
+    Trans := CGContextGetCTM(cgc);
+    CGContextRestoreGState(cgc);
     ApplyTransform(Trans);
   end;
 end;
diff --git a/lcl/interfaces/cocoa/cocoawinapi.inc b/lcl/interfaces/cocoa/cocoawinapi.inc
index f8f14555eb..713a220f65 100644
--- a/lcl/interfaces/cocoa/cocoawinapi.inc
+++ b/lcl/interfaces/cocoa/cocoawinapi.inc
@@ -1842,7 +1842,7 @@ var
   dc: TCocoaContext;
   gdi: TCocoaGDIObject;
 const
-  SName = 'TCarbonWidgetSet.SelectObject';
+  SName = 'TCocoaWidgetSet.SelectObject';
 begin
   {$IFDEF VerboseWinAPI}
     DebugLn(Format('TCocoaWidgetSet.SelectObject DC: %x GDIObj: %x', [ADC, GDIObj]));
@@ -2007,7 +2007,7 @@ begin
   ctx := CheckDC(DC);
   if not Assigned(ctx) then
     Exit;
-  if (ctx <> DefaultContext) and (ctx<>ScreenContext) then
+  if (ctx <> DefaultContext) and (ctx<>ScreenContext) and (not ctx.isControlDC) then
     ctx.Free;
   Result := 1;
 end;
diff --git a/lcl/interfaces/cocoa/cocoawscommon.pas b/lcl/interfaces/cocoa/cocoawscommon.pas
index 5a79856801..83802274b6 100644
--- a/lcl/interfaces/cocoa/cocoawscommon.pas
+++ b/lcl/interfaces/cocoa/cocoawscommon.pas
@@ -1028,6 +1028,7 @@ begin
   if Assigned(FContext) then
     Exit;
   FContext := TCocoaContext.Create(ControlContext);
+  FContext.isControlDC := True;
   try
     // debugln('Draw '+Target.name+' bounds='+Dbgs(NSRectToRect(bounds))+' dirty='+Dbgs(NSRectToRect(dirty)));
     if FContext.InitDraw(Round(bounds.size.width), Round(bounds.size.height)) then