diff --git a/client/src/main/java/ctbrec/ui/action/AddToGroupAction.java b/client/src/main/java/ctbrec/ui/action/AddToGroupAction.java
index cf2bf057..ab90f43a 100644
--- a/client/src/main/java/ctbrec/ui/action/AddToGroupAction.java
+++ b/client/src/main/java/ctbrec/ui/action/AddToGroupAction.java
@@ -9,7 +9,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import ctbrec.Config;
 import ctbrec.Model;
 import ctbrec.ModelGroup;
 import ctbrec.StringUtil;
@@ -72,7 +71,7 @@ public class AddToGroupAction {
         }
     }
 
-    private static class AddModelGroupDialog {
+    private class AddModelGroupDialog {
         private ComboBox<ModelGroupListItem> comboBox;
         private TextField editor;
         private ObservableListSuggester suggester;
@@ -86,9 +85,10 @@ public class AddToGroupAction {
             editor.requestFocus();
         }
 
-        Region getMainPane() {
+        Region getMainPane() throws InvalidKeyException, NoSuchAlgorithmException, IOException {
             var dialogPane = new GridPane();
-            Set<ModelGroup> modelGroups = Config.getInstance().getSettings().modelGroups;
+            Set<ModelGroup> modelGroups;
+            modelGroups = recorder.getModelGroups();
             List<ModelGroupListItem> comboBoxItems = modelGroups.stream().map(ModelGroupListItem::new).sorted().collect(Collectors.toList());
             ObservableList<ModelGroupListItem> comboBoxModel = FXCollections.observableArrayList(comboBoxItems);
             suggester = new ObservableListSuggester(comboBoxModel);