diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index 11b62312b82..c366ad7c350 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -792,7 +792,7 @@ export const ENTITY_PATH = {
   containers: 'container',
   tags: 'tag',
   glossaries: 'glossary',
-  searchindex: 'searchIndex',
+  searchIndex: 'searchIndex',
   storedProcedure: 'storedProcedure',
   glossaryTerm: 'glossaryTerm',
   database: 'database',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx
index e32db09d705..7f5dd5a77c9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx
@@ -140,7 +140,7 @@ const CustomEntityDetailV1 = () => {
       case ENTITY_PATH.containers:
         return PAGE_HEADERS.CONTAINER_CUSTOM_ATTRIBUTES;
 
-      case ENTITY_PATH.searchindex:
+      case ENTITY_PATH.searchIndex:
         return PAGE_HEADERS.SEARCH_INDEX_CUSTOM_ATTRIBUTES;
 
       case ENTITY_PATH.storedProcedure:
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx
index 4861a55ed12..e2e57e1076c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx
@@ -224,6 +224,18 @@ export const getGlobalSettingsMenuWithPermission = (
       category: i18next.t('label.custom-attribute-plural'),
       key: 'customAttributes',
       items: [
+        {
+          label: i18next.t('label.database'),
+          isProtected: Boolean(isAdminUser),
+          key: 'customAttributes.database',
+          icon: <DatabaseIcon className="side-panel-icons" />,
+        },
+        {
+          label: i18next.t('label.database-schema'),
+          isProtected: Boolean(isAdminUser),
+          key: 'customAttributes.databaseSchema',
+          icon: <SchemaIcon className="side-panel-icons" />,
+        },
         {
           label: i18next.t('label.table-plural'),
           isProtected: Boolean(isAdminUser),
@@ -231,10 +243,10 @@ export const getGlobalSettingsMenuWithPermission = (
           icon: <TableIcon className="side-panel-icons" />,
         },
         {
-          label: i18next.t('label.topic-plural'),
+          label: i18next.t('label.stored-procedure-plural'),
           isProtected: Boolean(isAdminUser),
-          key: 'customAttributes.topics',
-          icon: <TopicIcon className="side-panel-icons" />,
+          key: 'customAttributes.storedProcedure',
+          icon: <StoredProcedureIcon className="side-panel-icons" />,
         },
         {
           label: i18next.t('label.dashboard-plural'),
@@ -249,10 +261,10 @@ export const getGlobalSettingsMenuWithPermission = (
           icon: <PipelineIcon className="side-panel-icons" />,
         },
         {
-          label: i18next.t('label.ml-model-plural'),
+          label: i18next.t('label.topic-plural'),
           isProtected: Boolean(isAdminUser),
-          key: 'customAttributes.mlModels',
-          icon: <MlModelIcon className="side-panel-icons" />,
+          key: 'customAttributes.topics',
+          icon: <TopicIcon className="side-panel-icons" />,
         },
         {
           label: i18next.t('label.container-plural'),
@@ -260,36 +272,24 @@ export const getGlobalSettingsMenuWithPermission = (
           key: 'customAttributes.containers',
           icon: <StorageIcon className="side-panel-icons" />,
         },
+        {
+          label: i18next.t('label.ml-model-plural'),
+          isProtected: Boolean(isAdminUser),
+          key: 'customAttributes.mlModels',
+          icon: <MlModelIcon className="side-panel-icons" />,
+        },
         {
           label: i18next.t('label.search-index'),
           isProtected: Boolean(isAdminUser),
           key: 'customAttributes.searchIndex',
           icon: <SearchOutlined className="side-panel-icons" />,
         },
-        {
-          label: i18next.t('label.stored-procedure-plural'),
-          isProtected: Boolean(isAdminUser),
-          key: 'customAttributes.storedProcedure',
-          icon: <StoredProcedureIcon className="side-panel-icons" />,
-        },
         {
           label: i18next.t('label.glossary-term'),
           isProtected: Boolean(isAdminUser),
           key: 'customAttributes.glossaryTerm',
           icon: <GlossaryIcon className="side-panel-icons" />,
         },
-        {
-          label: i18next.t('label.database'),
-          isProtected: Boolean(isAdminUser),
-          key: 'customAttributes.database',
-          icon: <DatabaseIcon className="side-panel-icons" />,
-        },
-        {
-          label: i18next.t('label.database-schema'),
-          isProtected: Boolean(isAdminUser),
-          key: 'customAttributes.databaseSchema',
-          icon: <SchemaIcon className="side-panel-icons" />,
-        },
       ],
     },
     {