diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 0038963f5f60..12b3930a1443 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -885,7 +885,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
 
       myActiveStack.remove(id, false); // hidden window should be at the top of stack
 
-      if (wasActive && moveFocus) {
+      if (wasActive && moveFocus && !myActiveStack.isEmpty()) {
         final String toBeActivatedId = myActiveStack.pop();
         if (getInfo(toBeActivatedId).isVisible() || isStackEnabled()) {
           activateToolWindowImpl(toBeActivatedId, commandList, false, true);