diff --git a/awx/ui_next/src/screens/Organization/Organization.jsx b/awx/ui_next/src/screens/Organization/Organization.jsx
index cffca89d56..9727bdc411 100644
--- a/awx/ui_next/src/screens/Organization/Organization.jsx
+++ b/awx/ui_next/src/screens/Organization/Organization.jsx
@@ -43,13 +43,10 @@ class Organization extends Component {
   async componentDidUpdate(prevProps) {
     const { location, match } = this.props;
     const url = `/organizations/${match.params.id}/`;
-    const tabs = ['details', 'access', 'teams', 'notifications', 'edit'].map(
-      tab => `${url}${tab}`
-    );
-    const didNavigateFromTab = tabs.includes(prevProps.location.pathname);
+
     if (
+      prevProps.location.pathname.startsWith(url) &&
       prevProps.location !== location &&
-      didNavigateFromTab &&
       location.pathname === `${url}details`
     ) {
       await this.loadOrganization();