diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 6c79182fc5b..aa2627c0148 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -1020,7 +1020,7 @@ public void addParserResult(ParserResult pr, boolean focusPanel) {
      */
     @Deprecated
     public void output(final String s) {
-        statusLine.show(s, 3000);
+        DefaultTaskExecutor.runInJavaFXThread(() -> statusLine.show(s, 3000));
     }
 
     private void initActions() {
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
index ead48b18a3d..7a6d88ac463 100644
--- a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javafx.scene.control.TableColumn.SortType;
+
 import org.jabref.model.entry.BibtexSingleField;
 import org.jabref.model.entry.specialfields.SpecialField;
 
@@ -16,8 +18,9 @@ public class ColumnPreferences {
     private final List<SpecialField> specialFieldColumns;
     private final List<String> extraFileColumns;
     private final Map<String, Double> columnWidths;
+    private final Map<String, SortType> columnSortType;
 
-    public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean preferDoiOverUrl, boolean showEprintColumn, List<String> normalColumns, List<SpecialField> specialFieldColumns, List<String> extraFileColumns, Map<String, Double> columnWidths) {
+    public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean preferDoiOverUrl, boolean showEprintColumn, List<String> normalColumns, List<SpecialField> specialFieldColumns, List<String> extraFileColumns, Map<String, Double> columnWidths, Map<String, SortType> columnSortType) {
         this.showFileColumn = showFileColumn;
         this.showUrlColumn = showUrlColumn;
         this.preferDoiOverUrl = preferDoiOverUrl;
@@ -26,6 +29,7 @@ public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean
         this.specialFieldColumns = specialFieldColumns;
         this.extraFileColumns = extraFileColumns;
         this.columnWidths = columnWidths;
+        this.columnSortType = columnSortType;
     }
 
     public boolean showFileColumn() {
@@ -59,4 +63,8 @@ public List<String> getNormalColumns() {
     public double getPrefColumnWidth(String columnName) {
         return columnWidths.getOrDefault(columnName, BibtexSingleField.DEFAULT_FIELD_LENGTH);
     }
+
+    public Map<String, SortType> getSortTypesForColumns() {
+        return columnSortType;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 0c739e23b6a..62167d44da8 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -13,6 +14,8 @@
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.SortType;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.input.ClipboardContent;
@@ -62,7 +65,6 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private final NewDroppedFileHandler fileHandler;
     private final CustomLocalDragboard localDragboard = GUIGlobals.localDragboard;
 
-
     public MainTable(MainTableDataModel model, JabRefFrame frame,
                      BasePanel panel, BibDatabaseContext database,
                      MainTablePreferences preferences, ExternalFileTypes externalFileTypes, KeyBindingRepository keyBindingRepository) {
@@ -73,14 +75,15 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         this.undoManager = panel.getUndoManager();
 
         fileHandler = new NewDroppedFileHandler(frame.getDialogService(), database, externalFileTypes,
-                Globals.prefs.getFilePreferences(),
+                                                Globals.prefs.getFilePreferences(),
                                                 Globals.prefs.getImportFormatPreferences(),
                                                 Globals.prefs.getUpdateFieldPreferences(),
-                Globals.getFileUpdateMonitor()
+                                                Globals.getFileUpdateMonitor()
 
         );
 
         this.getColumns().addAll(new MainTableColumnFactory(database, preferences.getColumnPreferences(), externalFileTypes, panel.getUndoManager(), frame.getDialogService()).createColumns());
+
         new ViewModelTableRowFactory<BibEntryTableViewModel>()
                                                               .withOnMouseClickedEvent((entry, event) -> {
                                                                   if (event.getClickCount() == 2) {
@@ -94,13 +97,20 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
                                                               .setOnMouseDragEntered(this::handleOnDragEntered)
                                                               .install(this);
 
+        for (Entry<String, SortType> entries : preferences.getColumnPreferences().getSortTypesForColumns().entrySet()) {
+            Optional<TableColumn<BibEntryTableViewModel, ?>> column = this.getColumns().stream().filter(col -> entries.getKey().equals(col.getText())).findFirst();
+            column.ifPresent(col -> {
+                col.setSortType(entries.getValue());
+                this.getSortOrder().add(col);
+            });
+        }
+
         if (preferences.resizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
         }
         this.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
         this.setItems(model.getEntriesFilteredAndSorted());
-
         // Enable sorting
         model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
@@ -115,12 +125,6 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         // Store visual state
         new PersistenceVisualStateTable(this, Globals.prefs);
 
-        // TODO: enable DnD
-        //setDragEnabled(true);
-        //TransferHandler xfer = new EntryTableTransferHandler(this, frame, panel);
-        //setTransferHandler(xfer);
-        //pane.setTransferHandler(xfer);
-
         // TODO: Float marked entries
         //model.updateMarkingState(Globals.prefs.getBoolean(JabRefPreferences.FLOAT_MARKED_ENTRIES));
 
@@ -348,84 +352,6 @@ public List<BibEntry> getSelectedEntries() {
                                   .collect(Collectors.toList());
     }
 
-    /**
-     * This method sets up what Comparators are used for the various table columns.
-     * The ComparatorChooser enables and disables such Comparators as the user clicks
-     * columns, but this is where the Comparators are defined. Also, the ComparatorChooser
-     * is initialized with the sort order defined in Preferences.
-     */
-    private void setupComparatorChooser() {
-        // TODO: Proper sorting
-
-        /*
-        // Set initial sort columns:
-
-        // Default sort order:
-        String[] sortFields = new String[] {
-                Globals.prefs.get(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD),
-                Globals.prefs.get(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD),
-                Globals.prefs.get(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD)
-        };
-        boolean[] sortDirections = new boolean[] {
-                Globals.prefs.getBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING),
-                Globals.prefs.getBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING),
-                Globals.prefs.getBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING)
-        }; // descending
-
-        model.getSortedForUserDefinedTableColumnSorting().getReadWriteLock().writeLock().lock();
-        try {
-            for (int i = 0; i < sortFields.length; i++) {
-                int index = -1;
-
-                // TODO where is this prefix set?
-        //                if (!sortFields[i].startsWith(MainTableFormat.ICON_COLUMN_PREFIX))
-                if (sortFields[i].startsWith("iconcol:")) {
-                    for (int j = 0; j < tableFormat.getColumnCount(); j++) {
-                        if (sortFields[i].equals(tableFormat.getColumnName(j))) {
-                            index = j;
-                            break;
-                        }
-                    }
-                } else {
-                    index = tableFormat.getColumnIndex(sortFields[i]);
-                }
-                if (index >= 0) {
-                    comparatorChooser.appendComparator(index, 0, sortDirections[i]);
-                }
-            }
-        } finally {
-            model.getSortedForUserDefinedTableColumnSorting().getReadWriteLock().writeLock().unlock();
-        }
-
-        // Add action listener so we can remember the sort order:
-        comparatorChooser.addSortActionListener(e -> {
-            // Get the information about the current sort order:
-            List<String> fields = getCurrentSortFields();
-            List<Boolean> order = getCurrentSortOrder();
-            // Update preferences:
-            int count = Math.min(fields.size(), order.size());
-            if (count >= 1) {
-                Globals.prefs.put(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD, fields.get(0));
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING, order.get(0));
-            }
-            if (count >= 2) {
-                Globals.prefs.put(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD, fields.get(1));
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING, order.get(1));
-            } else {
-                Globals.prefs.put(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD, "");
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING, false);
-            }
-            if (count >= 3) {
-                Globals.prefs.put(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD, fields.get(2));
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING, order.get(2));
-            } else {
-                Globals.prefs.put(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD, "");
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING, false);
-            }
-        });
-        */
-    }
-
     private Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
         return model.getEntriesFilteredAndSorted()
                     .stream()
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index fa771bc9a3b..ff343bc16c4 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -120,6 +120,7 @@ public MainTableColumnFactory(BibDatabaseContext database, ColumnPreferences pre
         new ValueTableCellFactory<BibEntryTableViewModel, List<AbstractGroup>>()
                 .withGraphic(this::createGroupColorRegion)
                 .install(column);
+        column.setSortable(true);
         return column;
     }
 
@@ -156,6 +157,7 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractG
             new ValueTableCellFactory<BibEntryTableViewModel, String>()
                     .withText(text -> text)
                     .install(column);
+            column.setSortable(true);
             column.setPrefWidth(preferences.getPrefColumnWidth(columnName));
             columns.add(column);
         }
@@ -199,6 +201,7 @@ private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>
             column.setComparator(new RankingFieldComparator());
         }
 
+        column.setSortable(true);
         return column;
     }
 
@@ -374,7 +377,6 @@ private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileCol
                 new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
                         .withGraphic(linkedFiles -> createFileIcon(linkedFiles.stream().filter(linkedFile -> linkedFile.getFileType().equalsIgnoreCase(externalFileTypeName)).collect(Collectors.toList())))
                         .install(column);
-
         return column;
     }
 
diff --git a/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java b/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java
index 3407e291452..8405327047f 100644
--- a/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java
@@ -77,7 +77,7 @@ public ObservableValue<String> getColumnValue(BibEntryTableViewModel entry) {
             return null;
         }
 
-        ObjectBinding[] dependencies = bibtexFields.stream().map(entry::getField).toArray(ObjectBinding[]::new);
+        ObjectBinding<String>[] dependencies = bibtexFields.stream().map(entry::getField).toArray(ObjectBinding[]::new);
         return Bindings.createStringBinding(() -> computeText(entry), dependencies);
     }
 
@@ -99,7 +99,7 @@ private String computeText(BibEntryTableViewModel entry) {
             result = toUnicode.format(MainTableNameFormatter.formatName(result));
         }
 
-        if (result != null && !bibtexFields.contains(BibEntry.KEY_FIELD)) {
+        if ((result != null) && !bibtexFields.contains(BibEntry.KEY_FIELD)) {
             result = toUnicode.format(result).trim();
         }
         return result;
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
index 2b6e3708466..131e8b05c2e 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -1,10 +1,13 @@
 package org.jabref.gui.maintable;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.SortType;
 
 import org.jabref.preferences.JabRefPreferences;
 
@@ -16,12 +19,15 @@ public class PersistenceVisualStateTable {
 
     private final MainTable mainTable;
     private final JabRefPreferences preferences;
+    private final Map<String, SortType> columnsSortOrder = new LinkedHashMap<>();
 
     public PersistenceVisualStateTable(final MainTable mainTable, JabRefPreferences preferences) {
         this.mainTable = mainTable;
         this.preferences = preferences;
 
         mainTable.getColumns().addListener(this::onColumnsChanged);
+        mainTable.getColumns().forEach(col -> col.sortTypeProperty().addListener(obs -> updateColumnSortType(col.getText(), col.getSortType())));
+
     }
 
     private void onColumnsChanged(ListChangeListener.Change<? extends TableColumn<BibEntryTableViewModel, ?>> change) {
@@ -33,6 +39,12 @@ private void onColumnsChanged(ListChangeListener.Change<? extends TableColumn<Bi
         if (changed) {
             updateColumnPreferences();
         }
+
+    }
+
+    private void updateColumnSortType(String text, SortType sortType) {
+        columnsSortOrder.put(text, sortType);
+        preferences.setMainTableColumnSortType(columnsSortOrder);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index cf1e1554819..8ca2d2bc027 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -14,7 +14,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-
 /**
  * Preference tab for file sorting options.
  */
@@ -26,7 +25,7 @@ class ExportSortingPrefsTab extends Pane implements PrefsTab {
     private final RadioButton exportInTableOrder;
     private final RadioButton exportInSpecifiedOrder;
     private final SaveOrderConfigDisplay exportOrderPanel;
-    private final  GridPane builder = new GridPane();
+    private final GridPane builder = new GridPane();
 
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
@@ -38,9 +37,9 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
 
         exportOrderPanel = new SaveOrderConfigDisplay();
 
-        EventHandler<ActionEvent> listener =  (event) -> {
-                boolean selected = event.getSource() == exportInSpecifiedOrder;
-                exportOrderPanel.setEnabled(selected);
+        EventHandler<ActionEvent> listener = (event) -> {
+            boolean selected = event.getSource() == exportInSpecifiedOrder;
+            exportOrderPanel.setEnabled(selected);
         };
 
         exportInOriginalOrder.setOnAction(listener);
@@ -52,9 +51,9 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         // create GUI
         builder.add(exportSortOrder, 1, 1);
         builder.add(new Separator(), 2, 1);
-        builder.add(exportInOriginalOrder,  1, 2);
+        builder.add(exportInOriginalOrder, 1, 2);
         builder.add(new Line(), 2, 3);
-        builder.add(exportInTableOrder,  1, 4);
+        builder.add(exportInTableOrder, 1, 4);
         builder.add(new Line(), 2, 5);
         builder.add(exportInSpecifiedOrder, 1, 6);
         builder.add(new Line(), 2, 7);
@@ -64,6 +63,7 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
 
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index 9069ac21e09..4ec10405351 100644
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -1,24 +1,13 @@
 package org.jabref.gui.preferences;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
-import javafx.collections.FXCollections;
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
-import org.jabref.Globals;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
 class TablePrefsTab extends Pane implements PrefsTab {
@@ -26,9 +15,6 @@ class TablePrefsTab extends Pane implements PrefsTab {
     private final JabRefPreferences prefs;
 
     private final CheckBox autoResizeMode;
-    private final CheckBox priDesc;
-    private final CheckBox secDesc;
-    private final CheckBox terDesc;
 
     private final RadioButton namesAsIs;
     private final RadioButton namesFf;
@@ -38,13 +24,6 @@ class TablePrefsTab extends Pane implements PrefsTab {
     private final RadioButton noAbbrNames;
     private final RadioButton lastNamesOnly;
 
-    private final TextField priField;
-    private final TextField secField;
-    private final TextField terField;
-    private final TextField numericFields;
-    private final ComboBox priSort;
-    private final ComboBox secSort;
-    private final ComboBox terSort;
     private final GridPane builder = new GridPane();
 
     /**
@@ -62,13 +41,6 @@ public TablePrefsTab(JabRefPreferences prefs) {
          *
          * http://sourceforge.net/tracker/index.php?func=detail&aid=1540646&group_id=92314&atid=600306
          */
-        List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
-        fieldNames.add(BibEntry.KEY_FIELD);
-        Collections.sort(fieldNames);
-        String[] allPlusKey = fieldNames.toArray(new String[fieldNames.size()]);
-        priSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
-        secSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
-        terSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
 
         autoResizeMode = new CheckBox(Localization.lang("Fit table horizontally on screen"));
         namesAsIs = new RadioButton(Localization.lang("Show names unchanged"));
@@ -79,36 +51,6 @@ public TablePrefsTab(JabRefPreferences prefs) {
         abbrNames = new RadioButton(Localization.lang("Abbreviate names"));
         lastNamesOnly = new RadioButton(Localization.lang("Show last names only"));
 
-        priField = new TextField();
-        secField = new TextField();
-        terField = new TextField();
-
-        numericFields = new TextField();
-
-        priSort.setValue(Localization.lang("<select>"));
-        secSort.setValue(Localization.lang("<select>"));
-        terSort.setValue(Localization.lang("<select>"));
-
-        priSort.setOnAction(e -> {
-            if (priSort.getBaselineOffset() > 0) {
-                priField.setText(priSort.getItems().toString());
-            }
-        });
-        secSort.setOnAction(e -> {
-            if (secSort.getBaselineOffset() > 0) {
-                secField.setText(secSort.getItems().toString());
-            }
-        });
-        terSort.setOnAction(e -> {
-            if (terSort.getBaselineOffset() > 0) {
-                terField.setText(terSort.getItems().toString());
-            }
-        });
-
-        priDesc = new CheckBox(Localization.lang("Descending"));
-        secDesc = new CheckBox(Localization.lang("Descending"));
-        terDesc = new CheckBox(Localization.lang("Descending"));
-
         Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names"));
         formatOfAuthor.getStyleClass().add("sectionHeader");
         builder.add(formatOfAuthor, 1, 1);
@@ -123,38 +65,10 @@ public TablePrefsTab(JabRefPreferences prefs) {
         Label label1 = new Label("");
         builder.add(label1, 1, 6);
 
-        Label defaultSortCriteria = new Label(Localization.lang("Default sort criteria"));
-        defaultSortCriteria.getStyleClass().add("sectionHeader");
-        builder.add(defaultSortCriteria, 1, 7);
-        // Create a new panel with its own FormLayout for these items:
-        Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
-        builder.add(primarySortCriterion, 1, 8);
-        builder.add(priSort, 2, 8);
-        builder.add(priField, 3, 8);
-        builder.add(priDesc, 4, 8);
-
-        Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
-        builder.add(secondarySortCriterion, 1, 9);
-        builder.add(secSort, 2, 9);
-        builder.add(secField, 3, 9);
-        builder.add(secDesc, 4, 9);
-
-        Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
-        builder.add(tertiarySortCriterion, 1, 10);
-        builder.add(terSort, 2, 10);
-        builder.add(terField, 3, 10);
-        builder.add(terDesc, 4, 10);
-
-        Label sortFields = new Label(Localization.lang("Sort the following fields as numeric fields") + ':');
-        builder.add(sortFields, 1, 11);
-        builder.add(numericFields, 2, 11);
-
-        builder.add(new Label(""), 1, 12);
-
         Label general = new Label(Localization.lang("General"));
         general.getStyleClass().add("sectionHeader");
-        builder.add(general, 1, 13);
-        builder.add(autoResizeMode, 1, 14);
+        builder.add(general, 1, 7);
+        builder.add(autoResizeMode, 1, 8);
         namesNatbib.setOnAction(e -> {
             abbrNames.setDisable(namesNatbib.isSelected());
             lastNamesOnly.setDisable(namesNatbib.isSelected());
@@ -162,6 +76,7 @@ public TablePrefsTab(JabRefPreferences prefs) {
         });
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
@@ -170,10 +85,6 @@ public Node getBuilder() {
     public void setValues() {
         autoResizeMode.setSelected(prefs.getBoolean(JabRefPreferences.AUTO_RESIZE_MODE));
 
-        priField.setText(prefs.get(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD));
-        secField.setText(prefs.get(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD));
-        terField.setText(prefs.get(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD));
-
         if (prefs.getBoolean(JabRefPreferences.NAMES_AS_IS)) {
             namesAsIs.setSelected(true);
         } else if (prefs.getBoolean(JabRefPreferences.NAMES_FIRST_LAST)) {
@@ -190,21 +101,11 @@ public void setValues() {
         } else {
             noAbbrNames.setSelected(true);
         }
-        priDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING));
-        secDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING));
-        terDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING));
 
         abbrNames.setDisable(namesNatbib.isSelected());
         lastNamesOnly.setDisable(namesNatbib.isSelected());
         noAbbrNames.setDisable(namesNatbib.isSelected());
 
-        String numF = prefs.get(JabRefPreferences.NUMERIC_FIELDS);
-        if (numF == null) {
-            numericFields.setText("");
-        } else {
-            numericFields.setText(numF);
-        }
-
     }
 
     /**
@@ -222,22 +123,6 @@ public void storeSettings() {
         prefs.putBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES, abbrNames.isSelected());
 
         prefs.putBoolean(JabRefPreferences.AUTO_RESIZE_MODE, autoResizeMode.isSelected());
-        prefs.putBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING, priDesc.isSelected());
-        prefs.putBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING, secDesc.isSelected());
-        prefs.putBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING, terDesc.isSelected());
-        prefs.put(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD, priField.getText().toLowerCase(Locale.ROOT).trim());
-        prefs.put(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD, secField.getText().toLowerCase(Locale.ROOT).trim());
-        prefs.put(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD, terField.getText().toLowerCase(Locale.ROOT).trim());
-
-        String oldVal = prefs.get(JabRefPreferences.NUMERIC_FIELDS);
-        String newVal = numericFields.getText().trim();
-        if (newVal.isEmpty()) {
-            newVal = null;
-        }
-        if (!Objects.equals(oldVal, newVal)) {
-            prefs.put(JabRefPreferences.NUMERIC_FIELDS, newVal);
-            InternalBibtexFields.setNumericFields(Globals.prefs.getStringList(JabRefPreferences.NUMERIC_FIELDS));
-        }
 
     }
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index b406dcf8950..2826154551f 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -34,6 +35,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javafx.scene.control.TableColumn.SortType;
+
 import org.jabref.Globals;
 import org.jabref.JabRefException;
 import org.jabref.JabRefMain;
@@ -133,12 +136,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String PROXY_USERNAME = "proxyUsername";
     public static final String PROXY_PASSWORD = "proxyPassword";
     public static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
-    public static final String TABLE_PRIMARY_SORT_FIELD = "priSort";
-    public static final String TABLE_PRIMARY_SORT_DESCENDING = "priDescending";
-    public static final String TABLE_SECONDARY_SORT_FIELD = "secSort";
-    public static final String TABLE_SECONDARY_SORT_DESCENDING = "secDescending";
-    public static final String TABLE_TERTIARY_SORT_FIELD = "terSort";
-    public static final String TABLE_TERTIARY_SORT_DESCENDING = "terDescending";
+
     public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
     public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
     public static final String EXPORT_IN_SPECIFIED_ORDER = "exportInSpecifiedOrder";
@@ -151,6 +149,9 @@ public class JabRefPreferences implements PreferencesService {
     public static final String NEWLINE = "newline";
     public static final String COLUMN_WIDTHS = "columnWidths";
     public static final String COLUMN_NAMES = "columnNames";
+    public static final String COLUMN_IN_SORT_ORDER = "columnInSortOrder";
+    public static final String COlUMN_IN_SORT_ORDER_TYPE = "columnInSortOrderType";
+
     public static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS = "sidePaneComponentPreferredPositions";
     public static final String SIDE_PANE_COMPONENT_NAMES = "sidePaneComponentNames";
     public static final String XMP_PRIVACY_FILTERS = "xmpPrivacyFilters";
@@ -507,14 +508,6 @@ private JabRefPreferences() {
         // system locale as default
         defaults.put(LANGUAGE, Locale.getDefault().getLanguage());
 
-        // Sorting preferences
-        defaults.put(TABLE_PRIMARY_SORT_FIELD, FieldName.AUTHOR);
-        defaults.put(TABLE_PRIMARY_SORT_DESCENDING, Boolean.FALSE);
-        defaults.put(TABLE_SECONDARY_SORT_FIELD, FieldName.YEAR);
-        defaults.put(TABLE_SECONDARY_SORT_DESCENDING, Boolean.TRUE);
-        defaults.put(TABLE_TERTIARY_SORT_FIELD, FieldName.TITLE);
-        defaults.put(TABLE_TERTIARY_SORT_DESCENDING, Boolean.FALSE);
-
         defaults.put(REFORMAT_FILE_ON_SAVE_AND_EXPORT, Boolean.FALSE);
 
         // export order
@@ -536,6 +529,7 @@ private JabRefPreferences() {
 
         defaults.put(COLUMN_NAMES, "entrytype;author/editor;title;year;journal/booktitle;bibtexkey");
         defaults.put(COLUMN_WIDTHS, "75;300;470;60;130;100");
+
         defaults.put(XMP_PRIVACY_FILTERS, "pdf;timestamp;keywords;owner;note;review");
         defaults.put(USE_XMP_PRIVACY_FILTER, Boolean.FALSE);
         defaults.put(WORKING_DIRECTORY, USER_HOME);
@@ -1396,12 +1390,11 @@ public FilePreferences getFilePreferences() {
         Map<String, String> fieldDirectories = Stream.of(FieldName.FILE, FieldName.PDF, FieldName.PS)
                                                      .collect(Collectors.toMap(field -> field, field -> get(field + FilePreferences.DIR_SUFFIX, "")));
         return new FilePreferences(
-                getUser(),
-                fieldDirectories,
-                getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
-                get(IMPORT_FILENAMEPATTERN),
-                get(IMPORT_FILEDIRPATTERN)
-        );
+                                   getUser(),
+                                   fieldDirectories,
+                                   getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
+                                   get(IMPORT_FILENAMEPATTERN),
+                                   get(IMPORT_FILEDIRPATTERN));
     }
 
     public UpdateFieldPreferences getUpdateFieldPreferences() {
@@ -1529,7 +1522,7 @@ private NameFormatterPreferences getNameFormatterPreferences() {
 
     public FileLinkPreferences getFileLinkPreferences() {
         return new FileLinkPreferences(
-                Collections.singletonList(get(FieldName.FILE + FilePreferences.DIR_SUFFIX)),
+                                       Collections.singletonList(get(FieldName.FILE + FilePreferences.DIR_SUFFIX)),
                                        fileDirForDatabase);
     }
 
@@ -1624,8 +1617,8 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
 
     public CleanupPreferences getCleanupPreferences(JournalAbbreviationLoader journalAbbreviationLoader) {
         return new CleanupPreferences(
-                getLayoutFormatterPreferences(journalAbbreviationLoader),
-                getFilePreferences());
+                                      getLayoutFormatterPreferences(journalAbbreviationLoader),
+                                      getFilePreferences());
     }
 
     public CleanupPreset getCleanupPreset() {
@@ -1703,18 +1696,6 @@ public void storeExportSaveOrder(SaveOrderConfig config) {
         put(EXPORT_TERTIARY_SORT_FIELD, config.sortCriteria[2].field);
     }
 
-    public SaveOrderConfig loadTableSaveOrder() {
-        SaveOrderConfig config = new SaveOrderConfig();
-        config.sortCriteria[0].field = get(TABLE_PRIMARY_SORT_FIELD);
-        config.sortCriteria[0].descending = getBoolean(TABLE_PRIMARY_SORT_DESCENDING);
-        config.sortCriteria[1].field = get(TABLE_SECONDARY_SORT_FIELD);
-        config.sortCriteria[1].descending = getBoolean(TABLE_SECONDARY_SORT_DESCENDING);
-        config.sortCriteria[2].field = get(TABLE_TERTIARY_SORT_FIELD);
-        config.sortCriteria[2].descending = getBoolean(TABLE_TERTIARY_SORT_DESCENDING);
-
-        return config;
-    }
-
     public SaveOrderConfig loadExportSaveOrder() {
         SaveOrderConfig config = new SaveOrderConfig();
         config.sortCriteria[0].field = get(EXPORT_PRIMARY_SORT_FIELD);
@@ -1727,6 +1708,26 @@ public SaveOrderConfig loadExportSaveOrder() {
         return config;
     }
 
+    private SaveOrderConfig loadTableSaveOrder() {
+        SaveOrderConfig config = new SaveOrderConfig();
+        List<String> columns = getStringList(COLUMN_IN_SORT_ORDER);
+        List<Boolean> sortTypes = getStringList(COlUMN_IN_SORT_ORDER_TYPE).stream().map(SortType::valueOf).map(type -> type == SortType.DESCENDING ? true : false).collect(Collectors.toList());
+
+        if (columns.size() >= 1) {
+            config.sortCriteria[0].field = columns.get(0);
+            config.sortCriteria[0].descending = sortTypes.get(0);
+        }
+        if (columns.size() >= 2) {
+            config.sortCriteria[1].field = columns.get(1);
+            config.sortCriteria[1].descending = sortTypes.get(1);
+        }
+        if (columns.size() >= 3) {
+            config.sortCriteria[2].field = columns.get(2);
+            config.sortCriteria[2].descending = sortTypes.get(2);
+        }
+        return config;
+    }
+
     public Character getKeywordDelimiter() {
         return get(KEYWORD_SEPARATOR).charAt(0);
     }
@@ -1883,7 +1884,8 @@ public ColumnPreferences getColumnPreferences() {
                                      getStringList(COLUMN_NAMES),
                                      createSpecialFieldColumns(),
                                      createExtraFileColumns(),
-                                     createColumnWidths());
+                                     createColumnWidths(),
+                                     getMainTableColumnSortTypes());
     }
 
     public MainTablePreferences getMainTablePreferences() {
@@ -1959,4 +1961,21 @@ public void setIdBasedFetcherForEntryGenerator(String fetcherName) {
     public String getIdBasedFetcherForEntryGenerator() {
         return get(ID_ENTRY_GENERATOR);
     }
+
+    public void setMainTableColumnSortType(Map<String, SortType> sortOrder) {
+        putStringList(COLUMN_IN_SORT_ORDER, new ArrayList<>(sortOrder.keySet()));
+        List<String> sortTypes = sortOrder.values().stream().map(SortType::name).collect(Collectors.toList());
+        putStringList(COlUMN_IN_SORT_ORDER_TYPE, sortTypes);
+    }
+
+    public Map<String, SortType> getMainTableColumnSortTypes() {
+        List<String> columns = getStringList(COLUMN_IN_SORT_ORDER);
+        List<SortType> sortTypes = getStringList(COlUMN_IN_SORT_ORDER_TYPE).stream().map(SortType::valueOf).collect(Collectors.toList());
+        Map<String, SortType> map = new LinkedHashMap<>();
+        for (int i = 0; i < columns.size(); i++) {
+            map.put(columns.get(i), sortTypes.get(i));
+        }
+        return map;
+    }
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 2080d14f220..b5c30ff8deb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -14,8 +14,6 @@
 
 <field\ name>=<field name>
 
-<select>=<select>
-
 <select\ word>=<select word>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abbreviate journal names of the selected entries (ISO abbreviation)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abbreviate journal names of the selected entries (MEDLINE abbreviation)
@@ -253,8 +251,6 @@ Default\ grouping\ field=Default grouping field
 
 Default\ pattern=Default pattern
 
-Default\ sort\ criteria=Default sort criteria
-
 Delete=Delete
 
 Delete\ custom\ format=Delete custom format
@@ -1203,7 +1199,6 @@ Use\ IEEE\ LaTeX\ abbreviations=Use IEEE LaTeX abbreviations
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=When opening file link, search for matching file if no link is defined
 Settings\ for\ %0=Settings for %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Sort the following fields as numeric fields
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Line %0: Found corrupted BibTeX key.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Line %0: Found corrupted BibTeX key (contains whitespaces).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Line %0: Found corrupted BibTeX key (comma missing).