diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
index fcd14c7aa..3eb53c72d 100644
--- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -281,7 +281,9 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { thisFactory
       normalizeTemplate(RootPackage)
     case ScalaObjectClass | ObjectClass =>
       normalizeTemplate(AnyRefClass)
-    case _ if aSym.isModuleClass || aSym.isPackageObject =>
+    case _ if aSym.isPackageObject =>
+      aSym
+    case _ if aSym.isModuleClass =>
       normalizeTemplate(aSym.sourceModule)
     case _ =>
       aSym