diff --git a/lcl/interfaces/cocoa/cocoawsdialogs.pp b/lcl/interfaces/cocoa/cocoawsdialogs.pp
index d952790c1b..0498a7612e 100644
--- a/lcl/interfaces/cocoa/cocoawsdialogs.pp
+++ b/lcl/interfaces/cocoa/cocoawsdialogs.pp
@@ -85,14 +85,23 @@ type
     class procedure ShowModal(const ACommonDialog: TCommonDialog); override;
   end;
 
+  TColorPanelDelegate = objcclass(NSObject, NSWindowDelegateProtocol)
+  public
+    colorPanel: NSColorPanel;
+    ColorDialog: TColorDialog;
+    DontPickColorOnClose: Boolean;
+    // NSWindowDelegateProtocol
+    procedure windowWillClose(notification: NSNotification); message 'windowWillClose:';
+    //
+    procedure doPickColor; message 'doPickColor';
+    procedure pickColor; message 'pickColor'; // button action
+    procedure exit; message 'exit'; // button action
+  end;
 
 implementation
 
-
-
 { TCocoaWSFileDialog }
 
-
 {------------------------------------------------------------------------------
   Method:  TCocoaWSFileDialog.ShowModal
   Params:  ACommonDialog - LCL common dialog
@@ -235,20 +244,75 @@ end;  {TCocoaWSFileDialog.ShowModal}
  ------------------------------------------------------------------------------}
 class procedure TCocoaWSColorDialog.ShowModal(const ACommonDialog: TCommonDialog);
 var
-  ColorDialog: TColorDialog;
+  colorDelegate: TColorPanelDelegate;
+  ColorDialog: TColorDialog absolute ACommonDialog;
+  colorPanel: NSColorPanel;
+  session: NSModalSession;
+  inColor: RGBColor = (red: 128; green: 128; blue: 128);
+  outColor: RGBColor = (red: 0; green: 0; blue: 0);
+  //point: Point;  = {0, 0};
+  // accessory view
+  accessoryView: NSView;
+  lRect: NSRect;
+  okButton, cancelButton: NSButton;
 begin
   {$IFDEF VerboseWSClass}
   DebugLn('TCocoaWSColorDialog.ShowModal for ' + ACommonDialog.Name);
   {$ENDIF}
 
   ACommonDialog.UserChoice := mrCancel;
-  ColorDialog := ACommonDialog as TColorDialog;
+
+  colorPanel := NSColorPanel.sharedColorPanel();
+  colorPanel.setColor(ColorToNSColor(ColorDialog.Color));
+
+  colorDelegate := TColorPanelDelegate.alloc.init();
+  colorDelegate.colorPanel := colorPanel;
+  colorDelegate.ColorDialog := ColorDialog;
+
+  // setup panel and its accessory view
+  lRect := GetNSRect(0, 0, 220, 30);
+  accessoryView := NSView.alloc.initWithFrame(lRect);
+
+  lRect := GetNSRect(110, 4, 110-8, 24);
+  okButton := NSButton.alloc.initWithFrame(lRect);
+  okButton.setButtonType(NSMomentaryPushInButton);
+  okButton.setBezelStyle(NSRoundedBezelStyle);
+  okButton.setTitle(NSStringUtf8('Pick'));
+  okButton.setAction(objcselector('pickColor'));
+  okButton.setTarget(colorDelegate);
+
+  lRect := GetNSRect(8, 4, 110-8, 24);
+  cancelButton := NSButton.alloc.initWithFrame(lRect);
+  cancelButton.setButtonType(NSMomentaryPushInButton);
+  cancelButton.setBezelStyle(NSRoundedBezelStyle);
+  cancelButton.setTitle(NSStringUtf8('Cancel'));
+  cancelButton.SetAction(objcselector('exit'));
+  cancelButton.setTarget(colorDelegate);
+
+  accessoryView.addSubview(okButton.autorelease);
+  accessoryView.addSubview(cancelButton.autorelease);
+
+  colorPanel.setDelegate(colorDelegate);
+  colorPanel.setAccessoryView(accessoryView.autorelease);
+  colorPanel.setShowsAlpha(True);
+  colorPanel.setDefaultButtonCell(okButton.cell);
+
+  // load user settings
+  (*NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  NSString *color = [defaults stringForKey:@"startColor"];
+  if (color != nil) {
+    [panel setColor:[NSColor colorFromHex:color]];
+  }
+  [panel setMode:[defaults integerForKey:@"mode"]]; // will be 0 if not set, wich is NSGrayModeColorPanel
+*)
+
+  // show panel
+  colorPanel.makeKeyAndOrderFront(colorDelegate);
+  NSApp.runModalForWindow(colorPanel);
 end;
 
-
 { TCocoaWSFontDialog }
 
-
 {------------------------------------------------------------------------------
   Method:  TCocoaWSFontDialog.ShowModal
   Params:  ACommonDialog - LCL font dialog
@@ -267,4 +331,36 @@ begin
   AFontDialog.UserChoice := mrCancel;
 end;
 
+{ TColorPanelDelegate }
+
+procedure TColorPanelDelegate.windowWillClose(notification: NSNotification);
+begin
+  if not DontPickColorOnClose then
+  begin
+    ColorDialog.UserChoice := mrOk;
+    doPickColor();
+  end;
+  NSApp.stopModal();
+end;
+
+procedure TColorPanelDelegate.doPickColor();
+begin
+  ColorDialog.Color := NSColorToRGB(colorPanel.color);
+end;
+
+procedure TColorPanelDelegate.pickColor();
+begin
+  ColorDialog.UserChoice := mrCancel;
+  DontPickColorOnClose := True;
+  doPickColor();
+  exit();
+end;
+
+procedure TColorPanelDelegate.exit();
+begin
+  ColorDialog.UserChoice := mrOk;
+  DontPickColorOnClose := True;
+  colorPanel.close();
+end;
+
 end.
diff --git a/lcl/interfaces/cocoa/cocoawsfactory.pas b/lcl/interfaces/cocoa/cocoawsfactory.pas
index 114da69a51..ace4b54bd3 100644
--- a/lcl/interfaces/cocoa/cocoawsfactory.pas
+++ b/lcl/interfaces/cocoa/cocoawsfactory.pas
@@ -222,8 +222,8 @@ end;
 
 function RegisterFileDialog: Boolean; alias : 'WSRegisterFileDialog';
 begin
-   RegisterWSComponent(TFileDialog, TCocoaWSFileDialog);
-   Result := True;
+  RegisterWSComponent(TFileDialog, TCocoaWSFileDialog);
+  Result := True;
 end;
 
 function RegisterOpenDialog: Boolean; alias : 'WSRegisterOpenDialog';
@@ -243,7 +243,8 @@ end;
 
 function RegisterColorDialog: Boolean; alias : 'WSRegisterColorDialog';
 begin
-  Result := False;
+  RegisterWSComponent(TColorDialog, TCocoaWSColorDialog);
+  Result := True;
 end;
 
 function RegisterColorButton: Boolean; alias : 'WSRegisterColorButton';