diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
index c660caad22fb..f54e41dbae83 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
@@ -80,6 +80,8 @@ public class HierarchyTreeBuilder extends AbstractTreeBuilder {
   }
 
   protected boolean isAutoExpandNode(final NodeDescriptor nodeDescriptor) {
+    if (getTreeStructure().getRootElement().equals(nodeDescriptor.getElement())) return true;
+
     if (nodeDescriptor instanceof HierarchyNodeDescriptor) {
       return false;
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentComboLabel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentComboLabel.java
index 901c6b3b717f..ec4366d19360 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentComboLabel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentComboLabel.java
@@ -15,22 +15,14 @@
  */
 package com.intellij.openapi.wm.impl.content;
 
-import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.ui.popup.ListPopup;
-import com.intellij.openapi.ui.popup.PopupStep;
-import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.ui.content.Content;
-import com.intellij.ui.content.ContentManager;
 import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.Arrays;
 
 public class ContentComboLabel extends BaseLabel {
 
@@ -92,7 +84,8 @@ public class ContentComboLabel extends BaseLabel {
     int width = 0;
     for (int i = 0; i < myUi.myManager.getContentCount(); i++) {
       String text = myUi.myManager.getContent(i).getDisplayName();
-      int eachTextWidth = getFontMetrics(getFont()).stringWidth(text);
+      FontMetrics metrics = getFontMetrics(getFont());
+      int eachTextWidth = metrics.stringWidth(text != null ? text : "");
       width = Math.max(eachTextWidth, width);
     }