diff --git a/lcl/interfaces/cocoa/cocoaconfigfocusring.inc b/lcl/interfaces/cocoa/cocoaconfigfocusring.inc
index 373be1543a..bf1dda27ec 100644
--- a/lcl/interfaces/cocoa/cocoaconfigfocusring.inc
+++ b/lcl/interfaces/cocoa/cocoaconfigfocusring.inc
@@ -25,8 +25,8 @@
 setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaTabControl') );
 setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaButton') );
 setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaTextField') );
+setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaSpinEdit') );
 setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaComboBox') );
-setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaReadOnlyComboBox') );
 setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaTableListView') );
 setStrategy( TCocoaConfigFocusRing.Strategy.none, NSSTR('TCocoaCollectionView') );
 
diff --git a/lcl/interfaces/cocoa/cocoawsspin.pas b/lcl/interfaces/cocoa/cocoawsspin.pas
index 0f859e484c..9553c51a25 100644
--- a/lcl/interfaces/cocoa/cocoawsspin.pas
+++ b/lcl/interfaces/cocoa/cocoawsspin.pas
@@ -26,7 +26,7 @@ uses
   // widgetset
   WSSpin, WSLCLClasses,
   // cocoa ws
-  CocoaPrivate, CocoaWSCommon, CocoaTextEdits;
+  CocoaAll, CocoaPrivate, CocoaWSCommon, CocoaTextEdits, Cocoa_Extra;
 
 type
 
@@ -71,6 +71,7 @@ begin
   lSpin.callback := TLCLCommonCallback.Create(lSpin, AWinControl);
   if (lSpin.Stepper.isKindOfClass(TCocoaSpinEditStepper)) then
     TCocoaSpinEditStepper(lSpin.Stepper).callback:=lSpin.callback;
+  UpdateControlFocusRing(lSpin, AWinControl);
 end;
 
 class procedure TCocoaWSCustomFloatSpinEdit.DestroyHandle(const AWinControl: TWinControl);
diff --git a/lcl/interfaces/cocoa/cocoawsstdctrls.pas b/lcl/interfaces/cocoa/cocoawsstdctrls.pas
index 4b0fca385a..4e06ef589a 100644
--- a/lcl/interfaces/cocoa/cocoawsstdctrls.pas
+++ b/lcl/interfaces/cocoa/cocoawsstdctrls.pas
@@ -2001,6 +2001,7 @@ begin
     // to be tested and considered
     //ComboBoxSetBorderStyle(cmb, TCustomComboBoxAccess(AWinControl).BorderStyle);
     Result:=TLCLHandle(cmb);
+    UpdateControlFocusRing(cmb, AWinControl);
   end;
   //todo: 26 pixels is the height of 'normal' combobox. The value is taken from the Interface Builder!
   //      use the correct way to set the size constraints
diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk
index f6e3436624..2f1c1a5a7d 100644
--- a/lcl/interfaces/lcl.lpk
+++ b/lcl/interfaces/lcl.lpk
@@ -131,7 +131,7 @@ end;"/>
     <License Value="modified LGPL-2
 "/>
     <Version Major="3" Minor="99"/>
-    <Files Count="545">
+    <Files Count="547">
       <Item1>
         <Filename Value="carbon/agl.pp"/>
         <AddToUsesPkgSection Value="False"/>
@@ -2693,6 +2693,14 @@ end;"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="cocoatoolbar"/>
       </Item545>
+      <Item546>
+        <Filename Value="cocoa/cocoaconfigfocusring.inc"/>
+        <Type Value="Include"/>
+      </Item546>
+      <Item547>
+        <Filename Value="cocoa/cocoaconfig.inc"/>
+        <Type Value="Include"/>
+      </Item547>
     </Files>
     <CompatibilityMode Value="True"/>
     <LazDoc Paths="../../docs/xml/lcl"/>