diff --git a/web/client/plugins/widgetbuilder/MapBuilder.jsx b/web/client/plugins/widgetbuilder/MapBuilder.jsx
index 7fec5aaf56..b69c5e16e2 100644
--- a/web/client/plugins/widgetbuilder/MapBuilder.jsx
+++ b/web/client/plugins/widgetbuilder/MapBuilder.jsx
@@ -100,6 +100,7 @@ module.exports = mapBuilder(({
             selectedNodes={selectedNodes}
             selectedLayers={selectedLayers}
             selectedGroups={selectedGroups}
+            onNodeSelect={onNodeSelect}
             toggleLayerSelector={toggleLayerSelector}/></BuilderHeader>)}
         >
         {enabled ? <Builder
diff --git a/web/client/plugins/widgetbuilder/enhancers/mapToolbar.js b/web/client/plugins/widgetbuilder/enhancers/mapToolbar.js
index 4ec25c69fd..ff70a0e517 100644
--- a/web/client/plugins/widgetbuilder/enhancers/mapToolbar.js
+++ b/web/client/plugins/widgetbuilder/enhancers/mapToolbar.js
@@ -26,8 +26,9 @@ module.exports = compose(
     manageLayers,
     handleNodeEditing,
     withHandlers({
-        onRemoveSelected: ({selectedLayers = [], removeLayersById = () => { } }) => () => {
+        onRemoveSelected: ({selectedLayers = [], removeLayersById = () => { }, onNodeSelect = () => {} }) => () => {
             removeLayersById(selectedLayers);
+            selectedLayers.forEach(layer => onNodeSelect(layer, 'layer', false));
         }
     }),
     branch(