diff --git a/controls/combo.c b/controls/combo.c
index 3ab50282941..4e18dd85505 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1010,6 +1010,19 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC)
 	CBPaintButton(lphc, hDC, lphc->buttonRect);
       }
 
+      /* paint the edit control padding area */
+      if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST)
+      {
+          HPEN hPrevPen = SelectObject( hDC, GetSysColorPen(COLOR_WINDOW) );
+          RECT rPadEdit = lphc->textRect;
+
+          InflateRect(&rPadEdit, EDIT_CONTROL_PADDING(), EDIT_CONTROL_PADDING());
+
+          Rectangle( hDC, rPadEdit.left, rPadEdit.top, rPadEdit.right, rPadEdit.bottom);
+
+          SelectObject( hDC, hPrevPen );
+      }
+ 
       if( !(lphc->wState & CBF_EDIT) )
       {
 	/*