diff --git a/lcl/include/customupdown.inc b/lcl/include/customupdown.inc
index a7243eb035..d3474baad2 100644
--- a/lcl/include/customupdown.inc
+++ b/lcl/include/customupdown.inc
@@ -514,8 +514,11 @@ end;
 
 procedure TCustomUpDown.SetEnabled(Value: Boolean);
 begin
-  FMinBtn.Enabled := Value;
-  FMaxBtn.Enabled := Value;
+  if not FUseWS then
+  begin
+    FMinBtn.Enabled := Value;
+    FMaxBtn.Enabled := Value;
+  end;
   inherited SetEnabled(Value);
 end;