diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/AbstractTextFieldEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/AbstractTextFieldEditor.java
index 056bab0053a7..b305f6568f15 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/AbstractTextFieldEditor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/AbstractTextFieldEditor.java
@@ -54,7 +54,7 @@ public abstract class AbstractTextFieldEditor<V> extends PropertyEditor<V> {
       }
     }
     else{
-      myTf.setBorder(null);
+      myTf.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
     }
 
     return myTf;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/LabelPropertyRenderer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/LabelPropertyRenderer.java
index f8787fce036d..8542cdf2068c 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/LabelPropertyRenderer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/LabelPropertyRenderer.java
@@ -35,6 +35,7 @@ public class LabelPropertyRenderer<V> extends JLabel implements PropertyRenderer
   public LabelPropertyRenderer() {
     setOpaque(true);
     putClientProperty("html.disable", true);
+    setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
   }
 
   public LabelPropertyRenderer(String staticText) {