diff --git a/platform/platform-api/src/com/intellij/ui/components/JBTextArea.java b/platform/platform-api/src/com/intellij/ui/components/JBTextArea.java
index 35883b526db6..5d6e0e620447 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBTextArea.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBTextArea.java
@@ -62,6 +62,7 @@ public class JBTextArea extends JTextArea implements ComponentWithEmptyText {
         Insets margin = ObjectUtils.notNull(getMargin(), JBUI.emptyInsets());
         Insets ipad = getComponent().getIpad();
         Dimension size = getSize();
+        size.height = getPreferredSize().height;
         int left = insets.left + margin.left - ipad.left;
         int top = insets.top + margin.top - ipad.top;
         int right = size.width - (insets.right + margin.right - ipad.right);