diff --git a/frontend/src/components/common/account.js b/frontend/src/components/common/account.js
index fa2bb6c9f9..efaa3db75d 100644
--- a/frontend/src/components/common/account.js
+++ b/frontend/src/components/common/account.js
@@ -92,14 +92,18 @@ class Account extends Component {
   }
 
   renderMenu = () => {
-    let isAdminPage = this.state.isStaff || this.state.isOrgStaff;
-
-    if (isAdminPage && this.props.isAdminPanel) {
+    if (this.state.isStaff && this.props.isAdminPanel) {
       return (
         <a href={siteRoot} title={gettext('Exit Admin Panel')} className="item">{gettext('Exit Admin Panel')}</a>
       );
     }
 
+    if (this.state.isOrgStaff && this.props.isAdminPanel) {
+      return (
+        <a href={siteRoot} title={gettext('Exit Organization Admin')} className="item">{gettext('Exit Organization Admin')}</a>
+      );
+    }
+
     if (this.state.isStaff) {
       return (
         <a href={siteRoot + 'sys/useradmin/'} title={gettext('System Admin')} className="item">{gettext('System Admin')}</a>