diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
index 6310b5507dca57..42618d099ffcfe 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`TOCEntry is rendered 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -85,6 +86,7 @@ exports[`TOCEntry props Should shade background when not selected layer 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -159,6 +161,7 @@ exports[`TOCEntry props Should shade background when selected layer 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -233,6 +236,7 @@ exports[`TOCEntry props isReadOnly 1`] = `
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
@@ -292,6 +296,7 @@ exports[`TOCEntry props should display layer details when isLegendDetailsOpen is
   >
     <Connect(TOCEntryActionsPopover)
       displayName="layer 1"
+      editModeActiveForLayer={false}
       escapedDisplayName="layer_1"
       isEditButtonDisabled={false}
       layer={
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
index 712da6251fb96f..329e7751f67c52 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
@@ -281,6 +281,7 @@ export class TOCEntry extends Component<Props, State> {
           openLayerSettings={this._openLayerPanelWithCheck}
           isEditButtonDisabled={this.props.isEditButtonDisabled}
           supportsFitToBounds={this.state.supportsFitToBounds}
+          editModeActiveForLayer={this.props.editModeActiveForLayer}
         />
 
         {this._renderQuickActions()}
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
index 5068a5dc1ad711..5d1fc8e28f993b 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
@@ -115,6 +115,121 @@ exports[`TOCEntryActionsPopover is rendered 1`] = `
 </EuiPopover>
 `;
 
+exports[`TOCEntryActionsPopover should disable Edit features when edit mode active for layer 1`] = `
+<EuiPopover
+  anchorClassName="mapLayTocActions__popoverAnchor"
+  anchorPosition="leftUp"
+  button={
+    <Memo(Connect(TOCEntryButton))
+      displayName="layer 1"
+      escapedDisplayName="layer1"
+      layer={
+        LayerMock {
+          "_dataRequests": Array [],
+          "_descriptor": Object {
+            "__dataRequests": Array [],
+            "alpha": 0.75,
+            "id": "testLayer",
+            "includeInFitToBounds": true,
+            "label": null,
+            "maxZoom": 24,
+            "minZoom": 0,
+            "sourceDescriptor": Object {
+              "type": "mySourceType",
+            },
+            "style": null,
+            "visible": true,
+          },
+          "_source": MockSource {
+            "_descriptor": Object {
+              "type": "mySourceType",
+            },
+            "_inspectorAdapters": undefined,
+          },
+        }
+      }
+      onClick={[Function]}
+    />
+  }
+  className="mapLayTocActions"
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="testLayer"
+  isOpen={false}
+  ownFocus={true}
+  panelPaddingSize="none"
+>
+  <EuiContextMenu
+    data-test-subj="layerTocActionsPanellayer1"
+    initialPanelId={0}
+    panels={
+      Array [
+        Object {
+          "id": 0,
+          "items": Array [
+            Object {
+              "data-test-subj": "fitToBoundsButton",
+              "disabled": false,
+              "icon": <EuiIcon
+                size="m"
+                type="expand"
+              />,
+              "name": "Fit to data",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "layerVisibilityToggleButton",
+              "icon": <EuiIcon
+                size="m"
+                type="eyeClosed"
+              />,
+              "name": "Hide layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "layerSettingsButton",
+              "disabled": false,
+              "icon": <EuiIcon
+                size="m"
+                type="pencil"
+              />,
+              "name": "Edit layer settings",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "cloneLayerButton",
+              "icon": <EuiIcon
+                size="m"
+                type="copy"
+              />,
+              "name": "Clone layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "removeLayerButton",
+              "icon": <EuiIcon
+                size="m"
+                type="trash"
+              />,
+              "name": "Remove layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+          ],
+          "title": "Layer actions",
+        },
+      ]
+    }
+    size="m"
+  />
+</EuiPopover>
+`;
+
 exports[`TOCEntryActionsPopover should disable fit to data when supportsFitToBounds is false 1`] = `
 <EuiPopover
   anchorClassName="mapLayTocActions__popoverAnchor"
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
index 1187bae19e178d..1610954399ae7d 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
@@ -48,6 +48,7 @@ const defaultProps = {
   enableShapeEditing: () => {},
   enablePointEditing: () => {},
   openLayerSettings: () => {},
+  editModeActiveForLayer: false,
 };
 
 describe('TOCEntryActionsPopover', () => {
@@ -100,4 +101,17 @@ describe('TOCEntryActionsPopover', () => {
 
     expect(component).toMatchSnapshot();
   });
+
+  test('should disable Edit features when edit mode active for layer', async () => {
+    const component = shallow(
+      <TOCEntryActionsPopover {...defaultProps} editModeActiveForLayer={true} />
+    );
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
index ab7a54be37404c..83b4d2c2a756b2 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
@@ -36,6 +36,7 @@ export interface Props {
   removeLayer: (layerId: string) => void;
   supportsFitToBounds: boolean;
   toggleVisible: (layerId: string) => void;
+  editModeActiveForLayer: boolean;
 }
 
 interface State {
@@ -170,7 +171,7 @@ export class TOCEntryActionsPopover extends Component<Props, State> {
                 defaultMessage:
                   'Edit features only supported for document layers without clustering, joins, or time filtering',
               }),
-          disabled: !this.state.isFeatureEditingEnabled,
+          disabled: !this.state.isFeatureEditingEnabled || this.props.editModeActiveForLayer,
           onClick: async () => {
             this._closePopover();
             const supportedShapeTypes = await (this.props.layer.getSource() as ESSearchSource).getSupportedShapeTypes();