diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
index f5e8936d3..6779dfa03 100644
--- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java
+++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
@@ -72,8 +72,9 @@ public class ComponentTree extends JTree {
 
     @Override
     public void removeAll() {
-        if (previewPane != null && previewPane.isVisible()) {
+        if (previewPane != null) {
             previewPane.setVisible(false);
+            previewPane.removeAll();
         }
         super.removeAll();
     }