diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx
index 41658d1755a..d97b27c5263 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx
@@ -379,7 +379,7 @@ const DomainDetailsPage = ({
                   entity: t('label.domain'),
                 })}
                 icon={<StyleIcon color={DE_ACTIVE_COLOR} width="18px" />}
-                id="rename-button"
+                id="edit-style-button"
                 name={t('label.style')}
               />
             ),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx
index 16a702dc5ba..3785fab6a6e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx
@@ -43,7 +43,8 @@ const DomainPage = () => {
   const { fqn } = useParams<{ fqn: string }>();
   const history = useHistory();
   const { permissions } = usePermissionProvider();
-  const { domains, refreshDomains, updateDomains } = useDomainProvider();
+  const { domains, refreshDomains, updateDomains, domainLoading } =
+    useDomainProvider();
   const [isLoading, setIsLoading] = useState(false);
   const [isMainContentLoading, setIsMainContentLoading] = useState(true);
   const [activeDomain, setActiveDomain] = useState<Domain>();
@@ -114,8 +115,8 @@ const DomainPage = () => {
             ? getDomainPath(updatedDomains[0].fullyQualifiedName)
             : getDomainPath();
 
-        history.push(domainPath);
         refreshDomains();
+        history.push(domainPath);
       })
       .catch((err: AxiosError) => {
         showErrorToast(
@@ -144,13 +145,13 @@ const DomainPage = () => {
   };
 
   useEffect(() => {
-    if (domainFqn) {
+    if (domainFqn && domains.length > 0) {
       fetchDomainByName(domainFqn);
     }
-  }, [domainFqn]);
+  }, [domainFqn, domains]);
 
   useEffect(() => {
-    if (domains.length > 0 && !domainFqn) {
+    if (domains.length > 0 && !domainFqn && !domainLoading) {
       history.push(getDomainPath(domains[0].fullyQualifiedName));
     }
   }, [domains, domainFqn]);