diff --git a/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java b/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java
index 3c2efa26ebd9..ea508b8e2b92 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java
@@ -239,7 +239,16 @@ public class LoadingDecorator {
 
     @Override
     public Dimension getMinimumSize() {
-      return myContent != null ? myContent.getMinimumSize() : super.getMinimumSize();
+      return myContent != null && !isMinimumSizeSet()
+             ? myContent.getMinimumSize()
+             : super.getMinimumSize();
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+      return myContent != null && !isPreferredSizeSet()
+             ? myContent.getPreferredSize()
+             : super.getPreferredSize();
     }
 
     @Override