diff --git a/phy/cluster/manual/gui.py b/phy/cluster/manual/gui.py
index <HASH>..<HASH> 100644
--- a/phy/cluster/manual/gui.py
+++ b/phy/cluster/manual/gui.py
@@ -359,6 +359,13 @@ class ClusterManualGUI(BaseGUI):
         # actions. This allows for better before/after comparisons.
         if up.added:
             self.select(up.added, auto_update=False)
+        elif up.description == 'metadata_group':
+            cluster = up.metadata_changed[0]
+            if cluster == self.wizard.best:
+                self.wizard.next_best()
+            elif cluster == self.wizard.match:
+                self.wizard.next_match()
+            self._wizard_select()
         elif up.selection:
             self.select(up.selection, auto_update=False)
Fixed cluster selection in wizard after group change.