diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
index 5e6b3b347e91..f0856a3ee257 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
@@ -140,8 +140,8 @@ public class AndroidLayoutPreviewToolWindowManager implements ProjectComponent {
       myToolWindowForm = null;
       myToolWindow = null;
       myToolWindowDisposed = true;
-      LocalFileSystem.getInstance().removeVirtualFileListener(myListener);
     }
+    LocalFileSystem.getInstance().removeVirtualFileListener(myListener);
   }
 
   @NotNull