diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
index ebcacef8347d..02373e9c9521 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
@@ -130,6 +130,9 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel {
           return;
         }
         myPSIChangeListener.setInitialize();
+        if (!myPSIChangeListener.isActive()) {
+          return;
+        }
         myActionPanel.update();
         if (myRootComponent == null || !Comparing.equal(myProfileAction.getProfileManager().getSelectedTarget(), myLastTarget)) {
           myPSIChangeListener.activate();
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java
index 48f49f0ec2a2..f3302fcdb16b 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java
@@ -93,6 +93,10 @@ public class ExternalPSIChangeListener extends PsiTreeChangeAdapter {
     addRequest(myRunnable);
   }
 
+  public boolean isActive() {
+    return myRunState;
+  }
+
   public boolean isUpdateRenderer() {
     return myUpdateRenderer;
   }