From 3226af3df01ebf9143c32adf13fa89a82020015b Mon Sep 17 00:00:00 2001
From: Nick Forbes-Smith <nick@forbes-smith.com>
Date: Wed, 4 Oct 2023 22:00:11 +1100
Subject: [PATCH] Remove all now removes all pickedFeatures

---
 CHANGES.md                             | 1 +
 lib/ReactViews/Workbench/Workbench.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 490d3bb5d76..368876ed9ed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 #### next release (8.3.7)
 
+- Fix "Remove all" not removing selected/picked features
 - [The next improvement]
 
 #### 8.3.6 - 2023-10-03
diff --git a/lib/ReactViews/Workbench/Workbench.tsx b/lib/ReactViews/Workbench/Workbench.tsx
index ed9c55291f8..90526099a6e 100644
--- a/lib/ReactViews/Workbench/Workbench.tsx
+++ b/lib/ReactViews/Workbench/Workbench.tsx
@@ -52,6 +52,7 @@ class Workbench extends React.Component<IProps> {
         DataSourceAction.removeAllFromWorkbench,
         getPath(item)
       );
+      this.props.terria.removeSelectedFeaturesForModel(item);
     });
     this.props.terria.workbench.removeAll();
     (this.props.terria.timelineStack.items as any).clear();