diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp
index f4b831f95a..8170f86c68 100644
--- a/ideintf/objectinspector.pp
+++ b/ideintf/objectinspector.pp
@@ -2583,6 +2583,17 @@ begin
 
   if Layout = oilVertical then
     ValueRect.Left := NameTextRect.Left
+    {$IFDEF UseOICheckBox}
+    {$IFDEF WINDOWS}
+    // Make the edit control short, it reveals redraw problems in many places
+    // on Windows. Normally the long control hides the problems.
+    // Note! This has nothing to do with CheckBox editors directly.
+    // CheckBox only revealed the problem originally because its caption
+    // does not cover all the drawing area.
+    EditCompRect.Right:=EditCompRect.Left+50; // This line can be removed
+    later
+    {$ENDIF}
+    {$ENDIF}
   else
   begin
     inc(NameIconRect.Right, 2 + Ord(ShowGutter));