diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
index 93878359cefe..d62524975598 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
@@ -48,7 +48,6 @@ public final class HierarchyBrowserManager implements PersistentStateComponent<H
   public HierarchyBrowserManager(final Project project) {
     final ToolWindowManager toolWindowManager=ToolWindowManager.getInstance(project);
     final ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.HIERARCHY, true, ToolWindowAnchor.RIGHT, project);
-    toolWindow.setDefaultContentUiType(ToolWindowContentUiType.COMBO);
     myContentManager = toolWindow.getContentManager();
     toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowHierarchy.png"));
     new ContentManagerWatcher(toolWindow,myContentManager);
diff --git a/platform/platform-resources/src/idea/WindowManager.xml b/platform/platform-resources/src/idea/WindowManager.xml
index feffd433ede2..4845dd1e164e 100644
--- a/platform/platform-resources/src/idea/WindowManager.xml
+++ b/platform/platform-resources/src/idea/WindowManager.xml
@@ -15,6 +15,6 @@
     <!-- right stripe -->
     <window_info id="Commander" active="false" anchor="right" order="0" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" />
     <window_info id="Ant Build" active="false" anchor="right" order="1" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" />
-    <window_info id="Hierarchy" active="false" anchor="right" order="2" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" />
+    <window_info id="Hierarchy" active="false" anchor="right" order="2" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" content_ui="combo"/>
   </layout>
 </component>