diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index b88935f46efc..b3f56b46d224 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -1309,7 +1309,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
   }
 
   public boolean isDisposeInProgress() {
-    return myDisposeInProgress;
+    return myDisposeInProgress || ShutDownTracker.isShutdownHookRunning();
   }
 
   public boolean isRestartCapable() {