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 aae33a30..05de6bdd 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -77,7 +77,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     private AegisApplication _app;
     private VaultManager _vault;
     private boolean _loaded;
-    private List<String> _selectedGroups;
     private boolean _searchSubmitted;
 
     private boolean _isAuthenticating;
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
index be7f4659..673fdcc3 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@@ -420,6 +420,16 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _groups = groups;
         _groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
         updateDividerDecoration();
+
+        if (_groupFilter != null) {
+            List<String> groupFilter = _groupFilter.stream()
+                    .filter(g -> _groups.contains(g))
+                    .collect(Collectors.toList());
+
+            if (!_groupFilter.equals(groupFilter)) {
+                setGroupFilter(groupFilter, true);
+            }
+        }
     }
 
     private void updateDividerDecoration() {