diff --git a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/rpc-manager.ts b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/rpc-manager.ts
index 439a0d3139..9a30023aeb 100644
--- a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/rpc-manager.ts
+++ b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/rpc-manager.ts
@@ -51,7 +51,7 @@ import {
     VisualizableFieldsResponse
 } from "@wso2/ballerina-core";
 
-import { StateMachine } from "../../stateMachine";
+import { StateMachine, undoRedoManager } from "../../stateMachine";
 
 import {
     expandDMModel,
@@ -72,6 +72,7 @@ export class DataMapperRpcManager implements DataMapperAPI {
                     const varName = params.flowNode.properties?.variable?.value as string ?? null;
                     updateSource(model.textEdits, params.filePath, params.flowNode.codedata, varName)
                         .then(codeData => {
+                            undoRedoManager?.reset();
                             resolve({ textEdits: model.textEdits, codedata: codeData });
                         });
                 })
diff --git a/workspaces/ballerina/ballerina-extension/src/rpc-managers/visualizer/rpc-manager.ts b/workspaces/ballerina/ballerina-extension/src/rpc-managers/visualizer/rpc-manager.ts
index aa800f16d1..9646d28a78 100644
--- a/workspaces/ballerina/ballerina-extension/src/rpc-managers/visualizer/rpc-manager.ts
+++ b/workspaces/ballerina/ballerina-extension/src/rpc-managers/visualizer/rpc-manager.ts
@@ -122,7 +122,7 @@ export class VisualizerRpcManager implements VisualizerAPI {
                 const currentArtifact = await this.updateCurrentArtifactLocation({ artifacts: payload.data });
                 clearTimeout(timeoutId);
                 StateMachine.setReadyMode();
-                if (!currentArtifact) {
+                if (!currentArtifact && StateMachine.context().view !== MACHINE_VIEW.InlineDataMapper) {
                     openView(EVENT_TYPE.OPEN_VIEW, { view: MACHINE_VIEW.PackageOverview });
                     resolve("Undo successful"); // resolve the undo string
                 }