diff --git a/awx/ui_next/src/screens/Organization/Organization.jsx b/awx/ui_next/src/screens/Organization/Organization.jsx
index b957cbc67a..9727bdc411 100644
--- a/awx/ui_next/src/screens/Organization/Organization.jsx
+++ b/awx/ui_next/src/screens/Organization/Organization.jsx
@@ -41,8 +41,14 @@ class Organization extends Component {
   }
 
   async componentDidUpdate(prevProps) {
-    const { location } = this.props;
-    if (location !== prevProps.location) {
+    const { location, match } = this.props;
+    const url = `/organizations/${match.params.id}/`;
+
+    if (
+      prevProps.location.pathname.startsWith(url) &&
+      prevProps.location !== location &&
+      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');
   });
 });