diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.fxml b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.fxml
similarity index 51%
rename from src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.fxml
rename to src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.fxml
index 2e885d60011..d197a829648 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-<DialogPane minHeight="-Infinity" prefHeight="302.0" prefWidth="508.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.externalfiletype.EditExternalFileTypeEntryDialog">
+<DialogPane minHeight="-Infinity" prefHeight="302.0" prefWidth="508.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.externalfiletypes.EditExternalFileTypeEntryDialog">
     <content>
         <GridPane>
             <columnConstraints>
@@ -27,25 +27,23 @@
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
             </rowConstraints>
-            <children>
-                <Label text="%Icon"/>
-                <Label text="%Name" GridPane.rowIndex="1"/>
-                <Label text="%Extension" GridPane.rowIndex="2"/>
-                <Label text="%MIME type" GridPane.rowIndex="3"/>
-                <Label text="%Application" GridPane.rowIndex="4"/>
-                <RadioButton fx:id="defaultApplication" mnemonicParsing="false" selected="true" text="%Default" GridPane.columnIndex="1" GridPane.rowIndex="4">
-                    <toggleGroup>
-                        <ToggleGroup fx:id="applicationToggleGroup"/>
-                    </toggleGroup>
-                </RadioButton>
-                <TextField fx:id="name" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1"/>
-                <TextField fx:id="extension" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2"/>
-                <TextField fx:id="mimeType" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3"/>
-                <RadioButton fx:id="customApplication" mnemonicParsing="false" text="Custom" toggleGroup="$applicationToggleGroup" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
-                <TextField fx:id="selectedApplication" prefWidth="152.0" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
-                <Button fx:id="btnBrowse" mnemonicParsing="false" onAction="#openFileChooser" text="%Browse" GridPane.columnIndex="3" GridPane.rowIndex="5"/>
-                <Label fx:id="icon" GridPane.columnIndex="1"/>
-            </children>
+            <Label text="%Icon"/>
+            <Label text="%Name" GridPane.rowIndex="1"/>
+            <Label text="%Extension" GridPane.rowIndex="2"/>
+            <Label text="%MIME type" GridPane.rowIndex="3"/>
+            <Label text="%Application" GridPane.rowIndex="4"/>
+            <RadioButton fx:id="defaultApplication" mnemonicParsing="false" selected="true" text="%Default" GridPane.columnIndex="1" GridPane.rowIndex="4">
+                <toggleGroup>
+                    <ToggleGroup fx:id="applicationToggleGroup"/>
+                </toggleGroup>
+            </RadioButton>
+            <TextField fx:id="name" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1"/>
+            <TextField fx:id="extension" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2"/>
+            <TextField fx:id="mimeType" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3"/>
+            <RadioButton fx:id="customApplication" mnemonicParsing="false" text="Custom" toggleGroup="$applicationToggleGroup" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
+            <TextField fx:id="selectedApplication" prefWidth="152.0" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
+            <Button fx:id="btnBrowse" mnemonicParsing="false" onAction="#openFileChooser" text="%Browse" GridPane.columnIndex="3" GridPane.rowIndex="5"/>
+            <Label fx:id="icon" GridPane.columnIndex="1"/>
         </GridPane>
     </content>
     <ButtonType fx:constant="OK"/>
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
similarity index 90%
rename from src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
rename to src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
index 622ab07fb97..377291e96e4 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.externalfiletype;
+package org.jabref.gui.preferences.externalfiletypes;
 
 import javax.inject.Inject;
 
@@ -35,11 +35,12 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
     private final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
     private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
 
+    private final ExternalFileTypeItemViewModel item;
+
     private EditExternalFileTypeViewModel viewModel;
-    private CustomExternalFileType entry;
 
-    public EditExternalFileTypeEntryDialog(CustomExternalFileType entry, String dialogTitle) {
-        this.entry = entry;
+    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+        this.item = item;
 
         this.setTitle(dialogTitle);
 
@@ -57,7 +58,7 @@ public EditExternalFileTypeEntryDialog(CustomExternalFileType entry, String dial
 
     @FXML
     public void initialize() {
-        viewModel = new EditExternalFileTypeViewModel(entry);
+        viewModel = new EditExternalFileTypeViewModel(item);
 
         icon.setGraphic(viewModel.getIcon());
 
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
similarity index 65%
rename from src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java
rename to src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
index ed124bb4194..693f6eab412 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.externalfiletype;
+package org.jabref.gui.preferences.externalfiletypes;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -7,39 +7,41 @@
 import javafx.scene.Node;
 
 public class EditExternalFileTypeViewModel {
+    private final ExternalFileTypeItemViewModel fileTypeViewModel;
 
-    private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty nameProperty = new SimpleStringProperty("");
     private final StringProperty mimeTypeProperty = new SimpleStringProperty("");
+    private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty selectedApplicationProperty = new SimpleStringProperty("");
     private final BooleanProperty defaultApplicationSelectedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty customApplicationSelectedProperty = new SimpleBooleanProperty(false);
-    private final Node icon;
-    private final CustomExternalFileType fileType;
-
-    public EditExternalFileTypeViewModel(CustomExternalFileType fileType) {
-        this.fileType = fileType;
-        extensionProperty.setValue(fileType.getExtension());
-        nameProperty.setValue(fileType.getName());
-        mimeTypeProperty.setValue(fileType.getMimeType());
-        selectedApplicationProperty.setValue(fileType.getOpenWithApplication());
-        icon = fileType.getIcon().getGraphicNode();
-
-        if (fileType.getOpenWithApplication().isEmpty()) {
+
+    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel) {
+        this.fileTypeViewModel = fileTypeViewModel;
+
+        extensionProperty.setValue(fileTypeViewModel.extensionProperty().getValue());
+        nameProperty.setValue(fileTypeViewModel.nameProperty().getValue());
+        mimeTypeProperty.setValue(fileTypeViewModel.mimetypeProperty().getValue());
+
+        if (fileTypeViewModel.applicationProperty().getValue().isEmpty()) {
             defaultApplicationSelectedProperty.setValue(true);
         } else {
             customApplicationSelectedProperty.setValue(true);
         }
     }
 
-    public StringProperty extensionProperty() {
-        return extensionProperty;
+    public Node getIcon() {
+        return fileTypeViewModel.iconProperty().getValue().getGraphicNode();
     }
 
     public StringProperty nameProperty() {
         return nameProperty;
     }
 
+    public StringProperty extensionProperty() {
+        return extensionProperty;
+    }
+
     public StringProperty mimeTypeProperty() {
         return mimeTypeProperty;
     }
@@ -56,29 +58,25 @@ public BooleanProperty customApplicationSelectedProperty() {
         return customApplicationSelectedProperty;
     }
 
-    public Node getIcon() {
-        return icon;
-    }
-
     public void storeSettings() {
-        fileType.setName(nameProperty.getValue().trim());
-        fileType.setMimeType(mimeTypeProperty.getValue().trim());
+        fileTypeViewModel.nameProperty().setValue(nameProperty.getValue().trim());
+        fileTypeViewModel.mimetypeProperty().setValue(mimeTypeProperty.getValue().trim());
 
         String ext = extensionProperty.getValue().trim();
         if (!ext.isEmpty() && (ext.charAt(0) == '.')) {
-            fileType.setExtension(ext.substring(1));
+            fileTypeViewModel.extensionProperty().setValue(ext.substring(1));
         } else {
-            fileType.setExtension(ext);
+            fileTypeViewModel.extensionProperty().setValue(ext);
         }
 
         String application = selectedApplicationProperty.getValue().trim();
 
         // store application as empty if the "Default" option is selected, or if the application name is empty:
         if (defaultApplicationSelectedProperty.getValue() || application.isEmpty()) {
-            fileType.setOpenWith("");
+            fileTypeViewModel.applicationProperty().setValue("");
             selectedApplicationProperty.setValue("");
         } else {
-            fileType.setOpenWith(application);
+            fileTypeViewModel.applicationProperty().setValue(application);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
new file mode 100644
index 00000000000..da149d6e516
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
@@ -0,0 +1,68 @@
+package org.jabref.gui.preferences.externalfiletypes;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.externalfiletype.CustomExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabRefIcon;
+
+public class ExternalFileTypeItemViewModel {
+    private final ObjectProperty<JabRefIcon> icon = new SimpleObjectProperty<>();
+    private final StringProperty name = new SimpleStringProperty();
+    private final StringProperty extension = new SimpleStringProperty();
+    private final StringProperty mimetype = new SimpleStringProperty();
+    private final StringProperty application = new SimpleStringProperty();
+
+    public ExternalFileTypeItemViewModel(ExternalFileType fileType) {
+        this.icon.setValue(fileType.getIcon());
+        this.name.setValue(fileType.getName());
+        this.extension.setValue(fileType.getExtension());
+        this.mimetype.setValue(fileType.getMimeType());
+        this.application.setValue(fileType.getOpenWithApplication());
+    }
+
+    public ExternalFileTypeItemViewModel() {
+        this(new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE));
+    }
+
+    public ObjectProperty<JabRefIcon> iconProperty() {
+        return icon;
+    }
+
+    /**
+     * Used for sorting in the table
+     */
+    public String getName() {
+        return name.get();
+    }
+
+    public StringProperty nameProperty() {
+        return name;
+    }
+
+    public StringProperty extensionProperty() {
+        return extension;
+    }
+
+    public StringProperty mimetypeProperty() {
+        return mimetype;
+    }
+
+    public StringProperty applicationProperty() {
+        return application;
+    }
+
+    public ExternalFileType toExternalFileType() {
+        return new CustomExternalFileType(
+                this.name.get(),
+                this.extension.get(),
+                this.mimetype.get(),
+                this.application.get(),
+                this.icon.get().name(),
+                this.icon.get());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml
index 5d8b4556c70..040bb446dc7 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml
@@ -16,7 +16,7 @@
             <TableColumn fx:id="fileTypesTableIconColumn" minWidth="40.0" maxWidth="40.0"/>
             <TableColumn fx:id="fileTypesTableNameColumn" text="%Name"/>
             <TableColumn fx:id="fileTypesTableExtensionColumn" text="%Extension" prefWidth="120"/>
-            <TableColumn fx:id="fileTypesTableTypeColumn" text="%MIME type" prefWidth="150"/>
+            <TableColumn fx:id="fileTypesTableMimeTypeColumn" text="%MIME type" prefWidth="150"/>
             <TableColumn fx:id="fileTypesTableApplicationColumn" text="%Application" prefWidth="100"/>
             <TableColumn fx:id="fileTypesTableEditColumn" minWidth="40.0" maxWidth="40.0"/>
             <TableColumn fx:id="fileTypesTableDeleteColumn" minWidth="40.0" maxWidth="40.0"/>
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
index 0347047dee9..b131484ddc3 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
@@ -4,7 +4,6 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 
-import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
@@ -20,14 +19,14 @@
  */
 public class ExternalFileTypesTab extends AbstractPreferenceTabView<ExternalFileTypesTabViewModel> implements PreferencesTab {
 
-    @FXML private TableColumn<ExternalFileType, JabRefIcon> fileTypesTableIconColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableNameColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableExtensionColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableTypeColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableApplicationColumn;
-    @FXML private TableColumn<ExternalFileType, Boolean> fileTypesTableEditColumn;
-    @FXML private TableColumn<ExternalFileType, Boolean> fileTypesTableDeleteColumn;
-    @FXML private TableView<ExternalFileType> fileTypesTable;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, JabRefIcon> fileTypesTableIconColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableNameColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableExtensionColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableMimeTypeColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableApplicationColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableEditColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableDeleteColumn;
+    @FXML private TableView<ExternalFileTypeItemViewModel> fileTypesTable;
 
     public ExternalFileTypesTab() {
         ViewLoader.view(this)
@@ -42,26 +41,46 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        viewModel = new ExternalFileTypesTabViewModel(preferencesService.getFilePreferences());
+        viewModel = new ExternalFileTypesTabViewModel(preferencesService.getFilePreferences(), dialogService);
 
         fileTypesTable.setItems(viewModel.getFileTypes());
 
-        fileTypesTableIconColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getIcon()));
-        fileTypesTableNameColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getName()));
-        fileTypesTableExtensionColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getExtension()));
-        fileTypesTableTypeColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getMimeType()));
-        fileTypesTableApplicationColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getOpenWithApplication()));
+        fileTypesTableIconColumn.setCellValueFactory(cellData -> cellData.getValue().iconProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
+                .withGraphic(JabRefIcon::getGraphicNode)
+                .install(fileTypesTableIconColumn);
+
+        fileTypesTableNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(name -> name)
+                .install(fileTypesTableNameColumn);
+
+        fileTypesTableExtensionColumn.setCellValueFactory(cellData -> cellData.getValue().extensionProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(extension -> extension)
+                .install(fileTypesTableExtensionColumn);
+
+        fileTypesTableMimeTypeColumn.setCellValueFactory(cellData -> cellData.getValue().mimetypeProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(mimetype -> mimetype)
+                .install(fileTypesTableMimeTypeColumn);
+
+        fileTypesTableApplicationColumn.setCellValueFactory(cellData -> cellData.getValue().applicationProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(extension -> extension)
+                .install(fileTypesTableApplicationColumn);
+
         fileTypesTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
         fileTypesTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
 
-        new ValueTableCellFactory<ExternalFileType, JabRefIcon>()
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
                 .withGraphic(JabRefIcon::getGraphicNode)
                 .install(fileTypesTableIconColumn);
-        new ValueTableCellFactory<ExternalFileType, Boolean>()
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
                 .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
                 .install(fileTypesTableEditColumn);
-        new ValueTableCellFactory<ExternalFileType, Boolean>()
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withOnMouseClickedEvent((type, none) -> event -> viewModel.remove(type))
                 .install(fileTypesTableDeleteColumn);
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
index e1ff1973bcb..8a1faf6f8f4 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -1,77 +1,77 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
 import java.util.Comparator;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.externalfiletype.CustomExternalFileType;
-import org.jabref.gui.externalfiletype.EditExternalFileTypeEntryDialog;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.FilePreferences;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class ExternalFileTypesTabViewModel implements PreferenceTabViewModel {
 
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes = FXCollections.observableArrayList();
+
     private final FilePreferences filePreferences;
-    private final ObservableList<ExternalFileType> fileTypes = FXCollections.observableArrayList();
+    private final DialogService dialogService;
 
-    public ExternalFileTypesTabViewModel(FilePreferences filePreferences) {
+    public ExternalFileTypesTabViewModel(FilePreferences filePreferences, DialogService dialogService) {
         this.filePreferences = filePreferences;
+        this.dialogService = dialogService;
     }
 
     @Override
     public void setValues() {
-        fileTypes.setAll(filePreferences.getExternalFileTypes());
-        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
+        fileTypes.addAll(filePreferences.getExternalFileTypes().stream()
+                       .map(ExternalFileTypeItemViewModel::new)
+                       .toList());
+        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void storeSettings() {
+        Set<ExternalFileType> saveList = new HashSet<>();
+
+        fileTypes.stream().map(ExternalFileTypeItemViewModel::toExternalFileType)
+                 .forEach(type -> ExternalFileTypes.getDefaultExternalFileTypes().stream()
+                                                   .filter(type::equals).findAny()
+                                                   .ifPresentOrElse(saveList::add, () -> saveList.add(type)));
+
         filePreferences.getExternalFileTypes().clear();
-        filePreferences.getExternalFileTypes().addAll(fileTypes);
+        filePreferences.getExternalFileTypes().addAll(saveList);
     }
 
     public void resetToDefaults() {
-        List<ExternalFileType> list = ExternalFileTypes.getDefaultExternalFileTypes();
-        fileTypes.setAll(list);
-        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
+        fileTypes.setAll(ExternalFileTypes.getDefaultExternalFileTypes().stream()
+                                          .map(ExternalFileTypeItemViewModel::new)
+                                          .toList());
+        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void addNewType() {
-        CustomExternalFileType type = new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE);
-        fileTypes.add(type);
-        showEditDialog(type, Localization.lang("Add new file type"));
+        ExternalFileTypeItemViewModel item = new ExternalFileTypeItemViewModel();
+        fileTypes.add(item);
+        showEditDialog(item, Localization.lang("Add new file type"));
     }
 
-    public ObservableList<ExternalFileType> getFileTypes() {
+    public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
         return fileTypes;
     }
 
-    private void showEditDialog(ExternalFileType type, String dialogTitle) {
-        CustomExternalFileType typeForEdit;
-        if (type instanceof CustomExternalFileType) {
-            typeForEdit = (CustomExternalFileType) type;
-        } else {
-            typeForEdit = new CustomExternalFileType(type);
-            fileTypes.add(fileTypes.indexOf(type), typeForEdit);
-            fileTypes.remove(type);
-        }
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(typeForEdit, dialogTitle));
+    private void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle));
     }
 
-    public void edit(ExternalFileType type) {
+    public void edit(ExternalFileTypeItemViewModel type) {
         showEditDialog(type, Localization.lang("Edit file type"));
     }
 
-    public void remove(ExternalFileType type) {
+    public void remove(ExternalFileTypeItemViewModel type) {
         fileTypes.remove(type);
     }
 }