diff --git a/api/src/org/labkey/api/security/User.java b/api/src/org/labkey/api/security/User.java
index edc32e8e2ae..5a11e99787c 100644
--- a/api/src/org/labkey/api/security/User.java
+++ b/api/src/org/labkey/api/security/User.java
@@ -42,6 +42,7 @@
 import org.labkey.api.security.permissions.SampleWorkflowJobPermission;
 import org.labkey.api.security.permissions.SeeGroupDetailsPermission;
 import org.labkey.api.security.permissions.SiteAdminPermission;
+import org.labkey.api.security.permissions.TroubleshooterPermission;
 import org.labkey.api.security.permissions.TrustedPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.security.roles.AbstractRootContainerRole;
@@ -312,6 +313,11 @@ public boolean isTrustedBrowserDev()
         return hasRootPermissions(TRUSTED_BROWSER_DEV);
     }
 
+    public boolean isTroubleshooter()
+    {
+        return hasRootPermission(TroubleshooterPermission.class);
+    }
+
     public boolean isBrowserDev()
     {
         return hasRootPermission(BrowserDeveloperPermission.class);
diff --git a/api/src/org/labkey/api/view/PopupAdminView.java b/api/src/org/labkey/api/view/PopupAdminView.java
index 38a7a6b6408..3fa62d1178e 100644
--- a/api/src/org/labkey/api/view/PopupAdminView.java
+++ b/api/src/org/labkey/api/view/PopupAdminView.java
@@ -101,7 +101,7 @@ public static NavTree createNavTree(final ViewContext context)
             }
         }
 
-        if (user.isAnalyst() || user.hasRootPermission(TroubleshooterPermission.class))
+        if (user.isAnalyst() || user.isTroubleshooter())
         {
             NavTree devMenu = new NavTree("Developer Links");
             devMenu.addChildren(DeveloperMenu.getNavTree(context));