diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
index 0448e04b6e74..5b835856cc9f 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
+++ b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
@@ -296,6 +296,15 @@ public class CvsOperationExecutor {
           if (view != null) {
             output.connectToOutputView(tabbedWindow.addOutput(view), myProject);
           }
+        } else {
+          ApplicationManager.getApplication().invokeAndWait(new Runnable() {
+            public void run() {
+              Editor view = createView(myProject);
+              if (view != null) {
+                output.connectToOutputView(tabbedWindow.addOutput(view), myProject);
+              }              
+            }
+          }, ModalityState.defaultModalityState());
         }
       }
       return tabbedWindow;