diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorContainerFactory.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorContainerFactory.java
index 68847575d760..cd2edd151821 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorContainerFactory.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorContainerFactory.java
@@ -44,28 +44,30 @@ public class DockableEditorContainerFactory implements DockContainerFactory.Pers
   }
 
   private DockContainer createContainer(boolean loadingState) {
-    final Ref<DockableEditorTabbedContainer> container = new Ref<DockableEditorTabbedContainer>();
+    final Ref<DockableEditorTabbedContainer> containerRef = new Ref<DockableEditorTabbedContainer>();
     EditorsSplitters splitters = new EditorsSplitters(myFileEditorManager, myDockManager, false) {
       @Override
       protected void afterFileClosed(VirtualFile file) {
-        container.get().fireContentClosed(file);
+        containerRef.get().fireContentClosed(file);
       }
 
       @Override
       protected void afterFileOpen(VirtualFile file) {
-        container.get().fireContentOpen(file);
+        containerRef.get().fireContentOpen(file);
       }
 
       @Override
       protected IdeFrame getFrame(Project project) {
-        return DockManager.getInstance(project).getIdeFrame(container.get());
+        return DockManager.getInstance(project).getIdeFrame(containerRef.get());
       }
     };
     if (!loadingState) {
       splitters.createCurrentWindow();
     }
-    container.set(new DockableEditorTabbedContainer(myProject, splitters, true));
-    return container.get();
+    final DockableEditorTabbedContainer container = new DockableEditorTabbedContainer(myProject, splitters, true);
+    containerRef.set(container);
+    container.getSplitters().startListeningFocus();
+    return container;
   }
 
   @Override