diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
index 72bd104f5c8..5103fba8d29 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
@@ -17,6 +17,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrderConfig.SortCriterion;
 
 public class SaveOrderConfigDisplay {
 
@@ -85,12 +86,12 @@ public void setEnabled(boolean enabled) {
 
     public SaveOrderConfig getSaveOrderConfig() {
         SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
-        saveOrderConfig.getSortCriteria().get(0).field = getSelectedItemAsLowerCaseTrim(savePriSort);
-        saveOrderConfig.getSortCriteria().get(0).descending = savePriDesc.isSelected();
-        saveOrderConfig.getSortCriteria().get(1).field = getSelectedItemAsLowerCaseTrim(saveSecSort);
-        saveOrderConfig.getSortCriteria().get(1).descending = saveSecDesc.isSelected();
-        saveOrderConfig.getSortCriteria().get(2).field = getSelectedItemAsLowerCaseTrim(saveTerSort);
-        saveOrderConfig.getSortCriteria().get(2).descending = saveTerDesc.isSelected();
+        SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSort), savePriDesc.isSelected());
+        saveOrderConfig.getSortCriteria().add(primary);
+        SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSort), saveSecDesc.isSelected());
+        saveOrderConfig.getSortCriteria().add(secondary);
+        SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSort), saveTerDesc.isSelected());
+        saveOrderConfig.getSortCriteria().add(tertiary);
 
         return saveOrderConfig;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index 8ca2d2bc027..c567619ee61 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -6,6 +6,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Separator;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Line;
@@ -35,6 +36,11 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         exportInTableOrder = new RadioButton(Localization.lang("Export in current table sort order"));
         exportInSpecifiedOrder = new RadioButton(Localization.lang("Export entries ordered as specified"));
 
+        final ToggleGroup group = new ToggleGroup();
+        exportInOriginalOrder.setToggleGroup(group);
+        exportInTableOrder.setToggleGroup(group);
+        exportInSpecifiedOrder.setToggleGroup(group);
+
         exportOrderPanel = new SaveOrderConfigDisplay();
 
         EventHandler<ActionEvent> listener = (event) -> {