--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Thu May 24 01:04:42 2018 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Thu May 24 13:34:31 2018 +0530
@@ -2505,6 +2505,7 @@
             return null;
         while (!(kind.isClass() || kind.isInterface())) {
             encl = encl.getEnclosingElement();
+            kind = encl.getKind();
         }
         return (TypeElement)encl;
     }