diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index b0da5cbe43..873702f250 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -312,6 +312,10 @@ private void addChipTo(ChipGroup chipGroup, VaultGroupModel group) {
 
         chip.setOnCheckedChangeListener((group1, isChecked) -> {
             Set<UUID> groupFilter = new HashSet<>();
+            if (_actionMode != null) {
+                _actionMode.finish();
+            }
+
             setSaveChipVisibility(true);
 
             if (!isChecked) {