diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java
index 6d26481..b828c8e 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java
@@ -30,7 +30,7 @@
   @Override protected List<IOutlineNode> getInitiallyExpandedNodes() {
     IOutlineNode rootNode = getTreeProvider().createRoot(getXtextDocument());
     List<IOutlineNode> nodes = newArrayList(rootNode);
-    addChildrenToExpand(singletonList(rootNode), nodes, 3);
+    addChildrenToExpand(singletonList(rootNode), nodes, 0);
     return nodes;
   }
 
@@ -47,7 +47,7 @@
     if (parent instanceof DocumentRootNode) {
       return filter(parent.getChildren(), new Predicate<IOutlineNode>() {
         public boolean apply(IOutlineNode node) {
-          return !(node instanceof EStructuralFeatureNode);
+          return !(node instanceof SimpleOutlineNode);
         }
       });
     }