diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
index 9c01cb0939f9..12766a6fcdce 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
@@ -421,7 +421,12 @@ public class AndroidLayoutPreviewToolWindowManager implements ProjectComponent {
     }
 
     public void fileClosed(FileEditorManager source, VirtualFile file) {
-      processFileEditorChange(getActiveLayoutXmlEditor());
+      ApplicationManager.getApplication().invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          processFileEditorChange(getActiveLayoutXmlEditor());
+        }
+      });
     }
 
     public void selectionChanged(FileEditorManagerEvent event) {