diff --git a/components/exctrls/source/excheckcombo.pas b/components/exctrls/source/excheckcombo.pas
index 23b28acbe..9cd69211f 100644
--- a/components/exctrls/source/excheckcombo.pas
+++ b/components/exctrls/source/excheckcombo.pas
@@ -575,8 +575,16 @@ procedure TCheckComboBoxEx.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPoli
   const AXProportion, AYProportion: Double);
 begin
   inherited;
-  if FButtonWidth < 0 then
-    Buddy.Width := GetSystemMetrics(SM_CXVSCROLL);
+  if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
+  begin
+    if FButtonWidth < 0 then
+      Buddy.Width := GetSystemMetrics(SM_CXVSCROLL)
+    else
+    begin
+      FButtonWidth := round(AXProportion * FButtonWidth);
+      Buddy.Width := FButtonWidth;
+    end;
+  end;
 end;
 
 procedure TCheckComboBoxEx.DoChange;