diff --git a/public/components/Main/main.tsx b/public/components/Main/main.tsx
index b0aede8..3728710 100644
--- a/public/components/Main/main.tsx
+++ b/public/components/Main/main.tsx
@@ -291,7 +291,7 @@ export class Main extends React.Component<MainProps, MainState> {
       refreshTree: false,
       isAccelerationFlyoutOpened: false,
       isCallOutVisible: false,
-      cluster: 'Indexes',
+      cluster: props.urlDataSource ? 'Data source Connections' : 'Indexes',
       dataSourceOptions: [],
       selectedMDSDataConnectionId: this.props.dataSourceMDSId,
       mdsClusterName: '',
diff --git a/public/components/app.tsx b/public/components/app.tsx
index 5cf455f..2f90332 100644
--- a/public/components/app.tsx
+++ b/public/components/app.tsx
@@ -42,7 +42,7 @@ export const WorkbenchApp = ({
   setActionMenu,
 }: WorkbenchAppDeps) => {
   const isNavGroupEnabled = coreRefs?.chrome?.navGroup.getNavGroupEnabled();
-  const basePath = isNavGroupEnabled ? 'opensearch-query-workbench' : '';
+  const basePath = isNavGroupEnabled ? '/opensearch-query-workbench' : '';
 
   return (
     <HashRouter>
@@ -53,7 +53,7 @@ export const WorkbenchApp = ({
               <Switch>
                 <Route
                   exact
-                  path={`/${basePath}`}
+                  path={isNavGroupEnabled ? [`${basePath}`, `/`] : `/${basePath}`}
                   render={(props) => (
                     <Main
                       httpClient={http}
@@ -72,7 +72,7 @@ export const WorkbenchApp = ({
                 />
                 <Route
                   exact
-                  path={`/${basePath}/:dataSource`}
+                  path={`${basePath}/:dataSource`}
                   render={(props) => (
                     <Main
                       httpClient={http}
@@ -91,7 +91,7 @@ export const WorkbenchApp = ({
                 />
                 <Route
                   exact
-                  path={`/${basePath}/accelerate/:dataSource`}
+                  path={`${basePath}/accelerate/:dataSource`}
                   render={(props) => (
                     <Main
                       httpClient={http}