diff --git a/platform/util/src/com/intellij/util/ui/FormBuilder.java b/platform/util/src/com/intellij/util/ui/FormBuilder.java
index 52228e96ccbc..fe190d15fb0e 100644
--- a/platform/util/src/com/intellij/util/ui/FormBuilder.java
+++ b/platform/util/src/com/intellij/util/ui/FormBuilder.java
@@ -175,7 +175,12 @@ public class FormBuilder {
     if (component instanceof JComboBox) {
       return NONE;
     }
-    else if (component instanceof JScrollPane) return BOTH;
+    else if (component instanceof JScrollPane) {
+      return BOTH;
+    }
+    else if (component instanceof JTextField && ((JTextField)component).getColumns() != 0) {
+      return NONE;
+    }
     return HORIZONTAL;
   }