diff --git a/platform/platform-api/src/com/intellij/ui/components/JBLoadingPanel.java b/platform/platform-api/src/com/intellij/ui/components/JBLoadingPanel.java
index 84d9251d419a..2adcda496d3e 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBLoadingPanel.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBLoadingPanel.java
@@ -62,6 +62,17 @@ public class JBLoadingPanel extends JPanel {
     super.add(myDecorator.getComponent(), BorderLayout.CENTER);
   }
 
+  @Override
+  public void setLayout(LayoutManager mgr) {
+    if (!(mgr instanceof BorderLayout)) {
+      throw new IllegalArgumentException(String.valueOf(mgr));
+    }
+    super.setLayout(mgr);
+    if (myDecorator != null) {
+      super.add(myDecorator.getComponent(), BorderLayout.CENTER);
+    }
+  }
+
   public static void customizeStatusText(JLabel text) {
     Font font = text.getFont();
     text.setFont(font.deriveFont(font.getStyle(), font.getSize() + 6));