diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
index 3e4e9fa9649e..14a79bd1ee09 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
@@ -1,5 +1,5 @@
 /// <reference types="Cypress" />
-import viewWidgetsPage from "../../../../../locators/ViewWidgets.json";
+import publishWidgetspage from "../../../../../locators/publishWidgetspage.json";
 import {
   agHelper,
   entityExplorer,
@@ -13,8 +13,6 @@ import EditorNavigation, {
 } from "../../../../../support/Pages/EditorNavigation";
 
 const _mapChartCaption = "text:last-child";
-const _mapChartPlot = (text: string) =>
-  "//text()[contains(., '" + text + "')]/..";
 
 describe(
   "Map Chart Widget Functionality",
@@ -135,18 +133,17 @@ describe(
     it("4. Verify General settings", function () {
       // update the title and verify
       propPane.TypeTextIntoField("Title", "App Sign Up");
+      agHelper.AssertText(_mapChartCaption, "text", "App Sign Up");
       deployMode.DeployApp(
         locators._widgetInDeployed(draggableWidgets.MAPCHART),
       );
-      agHelper.AssertText(_mapChartCaption, "text", "App Sign Up");
       agHelper.VerifySnapshot(locators._root, "mapwithcustomtitle");
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("MapChart1", EntityType.Widget);
 
       // update the visibility using toggle and verify
       propPane.TogglePropertyState("Visible", "Off");
-      deployMode.DeployApp();
-      agHelper.AssertElementAbsence(
+      deployMode.DeployApp(
         locators._widgetInDeployed(draggableWidgets.MAPCHART),
       );
       agHelper.VerifySnapshot(locators._root, "mapwithvisibilityoff");
@@ -158,9 +155,6 @@ describe(
       deployMode.DeployApp(
         locators._widgetInDeployed(draggableWidgets.MAPCHART),
       );
-      agHelper.AssertElementVisibility(
-        locators._widgetInDeployed(draggableWidgets.MAPCHART),
-      );
       agHelper.VerifySnapshot(locators._root, "mapwithvisibilityon");
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("MapChart1", EntityType.Widget);
@@ -192,12 +186,17 @@ describe(
         propPane._actionSelectorFieldByLabel("Message"),
         "Data Point {{MapChart1.selectedDataPoint.label}} Clicked",
       );
-      agHelper.GetNClick(propPane._actionSelectorPopupClose);
+
       deployMode.DeployApp(
         locators._widgetInDeployed(draggableWidgets.MAPCHART),
       );
-      agHelper.GetNClick(_mapChartPlot("RU: 1.30"), 0, true);
-      agHelper.ValidateToastMessage("Data Point Russian Federation Clicked");
+      agHelper
+        .GetElement(publishWidgetspage.mapChartWidget)
+        .find("svg")
+        .find("text")
+        .should("contain.text", "IN: 2")
+        .click();
+      agHelper.ValidateToastMessage("Data Point India Clicked");
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("MapChart1", EntityType.Widget);
 
@@ -209,8 +208,13 @@ describe(
       deployMode.DeployApp(
         locators._widgetInDeployed(draggableWidgets.MAPCHART),
       );
-      agHelper.GetNClick(_mapChartPlot("CN: .40"), 0, true);
-      agHelper.ValidateToastMessage("Converted to Js and clicked China");
+      agHelper
+        .GetElement(publishWidgetspage.mapChartWidget)
+        .find("svg")
+        .find("text")
+        .should("contain.text", "IN: 2")
+        .click();
+      agHelper.ValidateToastMessage("Converted to Js and clicked India");
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("MapChart1", EntityType.Widget);
     });
diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt
index 31c0c0253fef..9a5d7a7a4bea 100644
--- a/app/client/cypress/limited-tests.txt
+++ b/app/client/cypress/limited-tests.txt
@@ -1,5 +1,6 @@
 # To run only limited tests - give the spec names in below format:
-cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+#cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
 
 # For running all specs - uncomment below:
 #cypress/e2e/**/**/*
diff --git a/app/client/cypress/locators/publishWidgetspage.json b/app/client/cypress/locators/publishWidgetspage.json
index 43f8c1d17f25..12baca6a6302 100644
--- a/app/client/cypress/locators/publishWidgetspage.json
+++ b/app/client/cypress/locators/publishWidgetspage.json
@@ -6,7 +6,7 @@
   "datepickerWidget": ".t--widget-datepickerwidget",
   "backToEditor": ".t--back-to-editor",
   "inputWidget": ".t--widget-inputwidgetv2",
-  "iconWidget":".t--widget-iconwidget",
+  "iconWidget": ".t--widget-iconwidget",
   "checkboxWidget": ".t--widget-checkboxwidget",
   "switchwidget": ".t--widget-switchwidget",
   "radioWidget": ".t--widget-radiogroupwidget",
@@ -21,6 +21,7 @@
   "tabWidget": ".t--widget-tabswidget",
   "jsonFormWidget": ".t--widget-jsonformwidget",
   "chartWidget": ".t--widget-chartwidget",
+  "mapChartWidget": ".t--widget-mapchartwidget",
   "tableWidget": ".t--widget-tablewidget",
   "chartCanvasVal": ".t--widget-chartwidget svg rect",
   "mapWidget": ".t--widget-mapwidget",
@@ -41,7 +42,7 @@
   "tableFilterInputValue": ".t--table-filter-value-input input",
   "canvas": ".canvas",
   "removeFilter": ".t--table-filter-remove-btn",
-    "rowHeight": ".t--property-control-rowheight .bp3-popover-target",
+  "rowHeight": ".t--property-control-rowheight .bp3-popover-target",
   "rowHeightOpt": ".t--table-compact-mode-option",
   "visibilityMode": ".t--table-column-visibility-toggle-btn",
   "visibilityOpt": ".option-title",