diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java
index 9bdc0e063937..8c3f564bd85c 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.Gray;
+import com.intellij.ui.paint.RectanglePainter;
 import com.intellij.util.ui.JBInsets;
 import com.intellij.util.ui.JBUI;
 
@@ -130,17 +131,19 @@ public class DarculaTextFieldUI extends TextFieldWithPopupHandlerUI {
   }
 
   protected void paintSearchField(Graphics2D g, JTextComponent c, Rectangle r) {
-    g.setColor(c.getBackground());
     final boolean noBorder = c.getClientProperty("JTextField.Search.noBorderRing") == Boolean.TRUE;
     int radius = r.height-1;
-    g.fillRoundRect(r.x, r.y+1, r.width, r.height - (noBorder ? 2 : 1), radius, radius);
-    g.setColor(c.isEnabled() ? Gray._100 : Gray._83);
-    if (!noBorder) {
-      if (c.hasFocus()) {
-          DarculaUIUtil.paintSearchFocusRing(g, r);
-      } else {
-        g.drawRoundRect(r.x, r.y, r.width, r.height-1, radius, radius);
-      }
+    if (noBorder) {
+      g.setColor(c.getBackground());
+      RectanglePainter.FILL.paint(g, r.x, r.y, r.width, r.height, radius);
+    }
+    else if (c.hasFocus()) {
+      g.setColor(c.getBackground());
+      RectanglePainter.FILL.paint(g, r.x, r.y, r.width, r.height, radius);
+      DarculaUIUtil.paintSearchFocusRing(g, r);
+    }
+    else {
+      RectanglePainter.paint(g, r.x, r.y, r.width, r.height, radius, c.getBackground(), c.isEnabled() ? Gray._100 : Gray._83);
     }
     Point p = getSearchIconCoord();
     Icon searchIcon = myTextField.getClientProperty("JTextField.Search.FindPopup") instanceof JPopupMenu ? UIManager.getIcon("TextField.darcula.searchWithHistory.icon") : UIManager.getIcon("TextField.darcula.search.icon");