diff --git a/awx/ui_next/src/screens/Organization/Organization.jsx b/awx/ui_next/src/screens/Organization/Organization.jsx
index 0045b79e9e..cffca89d56 100644
--- a/awx/ui_next/src/screens/Organization/Organization.jsx
+++ b/awx/ui_next/src/screens/Organization/Organization.jsx
@@ -43,8 +43,15 @@ class Organization extends Component {
   async componentDidUpdate(prevProps) {
     const { location, match } = this.props;
     const url = `/organizations/${match.params.id}/`;
-    const shouldUpdate = prevProps.location.pathname.includes(url);
-    if (location !== prevProps.location && shouldUpdate) {
+    const tabs = ['details', 'access', 'teams', 'notifications', 'edit'].map(
+      tab => `${url}${tab}`
+    );
+    const didNavigateFromTab = tabs.includes(prevProps.location.pathname);
+    if (
+      prevProps.location !== location &&
+      didNavigateFromTab &&
+      location.pathname === `${url}details`
+    ) {
       await this.loadOrganization();
     }
   }
diff --git a/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.jsx b/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.jsx
index 302ef6cab7..0f6e0c36c6 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.jsx
@@ -38,7 +38,7 @@ class OrganizationEdit extends Component {
       organization: { id },
       history,
     } = this.props;
-    history.push(`/organizations/${id}`);
+    history.push(`/organizations/${id}/details`);
   }
 
   handleSuccess() {
@@ -46,7 +46,7 @@ class OrganizationEdit extends Component {
       organization: { id },
       history,
     } = this.props;
-    history.push(`/organizations/${id}`);
+    history.push(`/organizations/${id}/details`);
   }
 
   async submitInstanceGroups(groupsToAssociate, groupsToDisassociate) {
diff --git a/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.test.jsx b/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.test.jsx
index 2a73761a74..102b49392f 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.test.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.test.jsx
@@ -76,6 +76,6 @@ describe('<OrganizationEdit />', () => {
     expect(history.push).not.toHaveBeenCalled();
     wrapper.find('button[aria-label="Cancel"]').prop('onClick')();
 
-    expect(history.push).toHaveBeenCalledWith('/organizations/1');
+    expect(history.push).toHaveBeenCalledWith('/organizations/1/details');
   });
 });