diff --git a/src/renderer/components/+apps-releases/releases.tsx b/src/renderer/components/+apps-releases/releases.tsx
index 34f9798783..4d38cb5a20 100644
--- a/src/renderer/components/+apps-releases/releases.tsx
+++ b/src/renderer/components/+apps-releases/releases.tsx
@@ -109,11 +109,23 @@ class NonInjectedHelmReleases extends Component<Dependencies & Props> {
         item.toggle();
       },
 
-      isSelectedAll: () =>
-        releases.get().every((release) => release.isSelected),
+      isSelectedAll: (visibleItems: RemovableHelmRelease[]) => (
+        visibleItems.length > 0
+        && visibleItems.every((release) => release.isSelected)
+      ),
 
-      toggleSelectionAll: () => {
-        releases.get().forEach((release) => release.toggle());
+      toggleSelectionAll: (visibleItems: RemovableHelmRelease[]) => {
+        let selected = false;
+
+        if (!legacyReleaseStore.isSelectedAll(visibleItems)) {
+          selected = true;
+        }
+
+        visibleItems.forEach((release) => {
+          if (release.isSelected !== selected) {
+            release.toggle();
+          }
+        });
       },
 
       isSelected: (item) => item.isSelected,
@@ -197,7 +209,7 @@ class NonInjectedHelmReleases extends Component<Dependencies & Props> {
           })}
           onDetails={this.onDetails}
         />
-        
+
         <ReleaseDetails
           hideDetails={this.hideDetails}
         />