diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js
index b8f16dacd4..b1ef2915ba 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js
@@ -1,5 +1,6 @@
 const commonlocators = require("../../../../locators/commonlocators.json");
 const templateLocators = require("../../../../locators/TemplatesLocators.json");
+const reconnectDatasourceLocators = require("../../../../locators/ReconnectLocators.js");
 import { ObjectsRegistry } from "../../../../support/Objects/Registry";
 const { AggregateHelper, HomePage } = ObjectsRegistry;
 
@@ -56,4 +57,27 @@ describe("Fork a template to an workspace", () => {
       templateLocators.templateViewForkButton,
     );
   });
+
+  it("4. Check if tooltip is working in 'Reconnect Datasources'", () => {
+    cy.NavigateToHome();
+    cy.get(templateLocators.templatesTab).click();
+    cy.wait(1000);
+    cy.xpath(
+      "//div[text()='Customer Messaging Tool']/parent::div//button[contains(@class, 't--fork-template')]",
+    )
+      .scrollIntoView()
+      .wait(500)
+      .click();
+    cy.get("body").then(($ele) => {
+      if ($ele.find(templateLocators.templateViewForkButton).length) {
+        cy.get(templateLocators.templateViewForkButton).click();
+      }
+    });
+    cy.get(templateLocators.dialogForkButton).click();
+    cy.get(reconnectDatasourceLocators.Modal).should("be.visible");
+    cy.get(reconnectDatasourceLocators.ListItemIcon)
+      .first()
+      .trigger("mouseover");
+    cy.get("[class$='popover-open']").should("be.visible");
+  });
 });
diff --git a/app/client/cypress/integration/SmokeSuite/Application/ReconnectDatasource_spec.js b/app/client/cypress/integration/SmokeSuite/Application/ReconnectDatasource_spec.js
index 4d848027af..e1d1e05b40 100644
--- a/app/client/cypress/integration/SmokeSuite/Application/ReconnectDatasource_spec.js
+++ b/app/client/cypress/integration/SmokeSuite/Application/ReconnectDatasource_spec.js
@@ -33,7 +33,7 @@ describe("Reconnect Datasource Modal validation while importing application", fu
               "Untitled Datasource",
             );
             // not configured yet
-            cy.get(".t--ds-list .cs-icon")
+            cy.get(".t--ds-list .t--ds-list-icon")
               .invoke("attr", "name")
               .should("eq", "info");
             // check db type
diff --git a/app/client/cypress/locators/ReconnectLocators.js b/app/client/cypress/locators/ReconnectLocators.js
index 0f36420058..b71728d005 100644
--- a/app/client/cypress/locators/ReconnectLocators.js
+++ b/app/client/cypress/locators/ReconnectLocators.js
@@ -4,4 +4,5 @@ export default {
   SkipToAppBtn: ".t--skip-to-application-btn",
   ImportSuccessModal: ".t--import-app-success-modal",
   ImportSuccessModalCloseBtn: ".t--import-success-modal-got-it",
+  ListItemIcon: ".t--ds-list-icon"
 };
diff --git a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx
index 06db6bfd62..8ce59509a3 100644
--- a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx
@@ -1,5 +1,11 @@
-import { Icon, IconSize, Text, TextType } from "design-system-old";
 import { Colors } from "constants/Colors";
+import {
+  Icon,
+  IconSize,
+  Text,
+  TextType,
+  TooltipComponent,
+} from "design-system-old";
 import type { Datasource } from "entities/Datasource";
 import { PluginImage } from "pages/Editor/DataSourceEditor/JSONtoForm";
 import React from "react";
@@ -69,11 +75,14 @@ function ListItemWrapper(props: {
           >
             {ds.name}
           </Text>
-          <Icon
-            fillColor={ds.isConfigured ? Colors.GREEN : Colors.ERROR_RED}
-            name={ds.isConfigured ? "oval-check" : "info"}
-            size={IconSize.MEDIUM}
-          />
+          <TooltipComponent content={ds.name} position="left">
+            <Icon
+              className="t--ds-list-icon"
+              fillColor={ds.isConfigured ? Colors.GREEN : Colors.ERROR_RED}
+              name={ds.isConfigured ? "oval-check" : "info"}
+              size={IconSize.MEDIUM}
+            />
+          </TooltipComponent>
         </DsTitle>
         <Text color={Colors.GRAY_700} type={TextType.H5}>
           {plugin.name}