diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 595e301f3..c5f81a9d8 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -494,8 +494,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void updateStatus() {
             setEnabled(enableModes.contains(currentMode));
             setVisible(visibleModes.contains(currentMode));
-            if (!isEnabled() && isPoppedOut()) {
-                popupDialog.showDefaultPane();
+            if (isPoppedOut()) {
+                if (!isVisible()) {
+                    popToFrame();
+                } else if (!isEnabled()) {
+                    popupDialog.showDefaultPane();
+                }
             }
         }