diff --git a/x-pack/plugins/maps/public/actions/layer_actions.ts b/x-pack/plugins/maps/public/actions/layer_actions.ts
index 8bd79474e7f71d..1d239a75d1499e 100644
--- a/x-pack/plugins/maps/public/actions/layer_actions.ts
+++ b/x-pack/plugins/maps/public/actions/layer_actions.ts
@@ -11,6 +11,7 @@ import { Query } from 'src/plugins/data/public';
 import { MapStoreState } from '../reducers/store';
 import {
   createLayerInstance,
+  getEditState,
   getLayerById,
   getLayerList,
   getLayerListRaw,
@@ -481,6 +482,11 @@ function removeLayerFromLayerList(layerId: string) {
       type: REMOVE_LAYER,
       id: layerId,
     });
+    // Clean up draw state if needed
+    const editState = getEditState(getState());
+    if (layerId === editState?.layerId) {
+      dispatch(setDrawMode(DRAW_MODE.NONE));
+    }
   };
 }