diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
index 8c1391574b..04a3ebd767 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
@@ -79,7 +79,7 @@ describe("excludeForAirgap", "Fork a template to an workspace", () => {
       .find(reconnectDatasourceLocators.ListItemIcon)
       .should("be.visible");
     cy.get(reconnectDatasourceLocators.DatasourceList)
-      .find(reconnectDatasourceLocators.ListItemIcon, {
+      .find(reconnectDatasourceLocators.DatasourceTitle, {
         withinSubject: null,
       })
       .first()
diff --git a/app/client/cypress/locators/ReconnectLocators.js b/app/client/cypress/locators/ReconnectLocators.js
index 13b76bc286..837f5776d2 100644
--- a/app/client/cypress/locators/ReconnectLocators.js
+++ b/app/client/cypress/locators/ReconnectLocators.js
@@ -6,4 +6,5 @@ export default {
   ImportSuccessModalCloseBtn: ".t--import-success-modal-got-it",
   ListItemIcon: ".ads-v2-icon",
   DatasourceList: ".t--ds-list",
+  DatasourceTitle: ".t--ds-list-title",
 };
diff --git a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx
index 558b7de21b..9853af3beb 100644
--- a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx
@@ -76,15 +76,15 @@ function ListItemWrapper(props: {
     >
       <PluginImage alt="Datasource" src={getAssetUrl(plugin?.iconLocation)} />
       <ListLabels>
-        <DsTitle>
-          <Text
-            className="t--ds-list-title"
-            color="var(--ads-v2-color-fg-emphasis)"
-            type={TextType.H4}
-          >
-            {ds.name}
-          </Text>
-          <Tooltip content={ds.name} placement="left">
+        <Tooltip content={ds.name} placement="left">
+          <DsTitle>
+            <Text
+              className="t--ds-list-title"
+              color="var(--ads-v2-color-fg-emphasis)"
+              type={TextType.H4}
+            >
+              {ds.name}
+            </Text>
             <Icon
               color={
                 isPluginAuthorized
@@ -94,8 +94,8 @@ function ListItemWrapper(props: {
               name={isPluginAuthorized ? "oval-check" : "info"}
               size="md"
             />
-          </Tooltip>
-        </DsTitle>
+          </DsTitle>
+        </Tooltip>
         <Text color="var(--ads-v2-color-fg)" type={TextType.H5}>
           {plugin?.name}
         </Text>