diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java
index 5d8c68e9fa4..4a250f6f549 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java
@@ -8,9 +8,11 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.logic.l10n.Localization;
 
 public class CustomizeExternalFileTypesViewModel {
-    private ObservableList<ExternalFileType> fileTypes;
+
+    private final ObservableList<ExternalFileType> fileTypes;
 
     public CustomizeExternalFileTypesViewModel() {
         Set<ExternalFileType> types = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
@@ -34,14 +36,14 @@ public void resetToDefaults() {
     public void addNewType() {
         CustomExternalFileType type = new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE);
         fileTypes.add(type);
-        edit(type);
+        showEditDialog(type, Localization.lang("Add new file type"));
     }
 
     public ObservableList<ExternalFileType> getFileTypes() {
         return fileTypes;
     }
 
-    public void edit(ExternalFileType type) {
+    private void showEditDialog(ExternalFileType type, String dialogTitle) {
         CustomExternalFileType typeForEdit;
         if (type instanceof CustomExternalFileType) {
             typeForEdit = (CustomExternalFileType) type;
@@ -49,8 +51,12 @@ public void edit(ExternalFileType type) {
             typeForEdit = new CustomExternalFileType(type);
         }
 
-        ExternalFileTypeEntryEditor entryEditor = new ExternalFileTypeEntryEditor(typeForEdit);
-        entryEditor.setVisible(true);
+        EditExternalFileTypeEntryDialog dlg = new EditExternalFileTypeEntryDialog(typeForEdit, dialogTitle);
+        dlg.showAndWait();
+    }
+
+    public void edit(ExternalFileType type) {
+        showEditDialog(type, Localization.lang("Edit file type"));
     }
 
     public void remove(ExternalFileType type) {
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeDialog.fxml b/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeDialog.fxml
new file mode 100644
index 00000000000..11da6fc3712
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeDialog.fxml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?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">
+   <content>
+      <GridPane>
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <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>
+      </GridPane>
+   </content>
+   <ButtonType fx:constant="OK" />
+   <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
new file mode 100644
index 00000000000..88566e07772
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
@@ -0,0 +1,79 @@
+package org.jabref.gui.externalfiletype;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.FileDialogConfiguration;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
+
+    @FXML private RadioButton defaultApplication;
+    @FXML private ToggleGroup applicationToggleGroup;
+    @FXML private TextField extension;
+    @FXML private TextField name;
+    @FXML private TextField mimeType;
+    @FXML private RadioButton customApplication;
+    @FXML private TextField selectedApplication;
+    @FXML private Button btnBrowse;
+    @FXML private Label icon;
+    @Inject private DialogService dialogService;
+
+    private final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
+    private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
+
+    private EditExternalFileTypeViewModel viewModel;
+    private CustomExternalFileType entry;
+
+    public EditExternalFileTypeEntryDialog(CustomExternalFileType entry, String dialogTitle) {
+        this.entry = entry;
+
+        this.setTitle(dialogTitle);
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        this.setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                viewModel.storeSettings();
+            }
+            return null;
+        });
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new EditExternalFileTypeViewModel(entry);
+
+        icon.setGraphic(viewModel.getIcon());
+
+        defaultApplication.selectedProperty().bindBidirectional(viewModel.defaultApplicationSelectedProperty());
+        selectedApplication.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
+        btnBrowse.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
+
+        extension.textProperty().bindBidirectional(viewModel.extensionProperty());
+        name.textProperty().bindBidirectional(viewModel.nameProperty());
+        mimeType.textProperty().bindBidirectional(viewModel.mimeTypeProperty());
+        selectedApplication.textProperty().bindBidirectional(viewModel.selectedApplicationProperty());
+    }
+
+    @FXML
+    private void openFileChooser(ActionEvent event) {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> viewModel.selectedApplicationProperty().setValue(path.toAbsolutePath().toString()));
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java b/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java
new file mode 100644
index 00000000000..9697f6fded1
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java
@@ -0,0 +1,88 @@
+package org.jabref.gui.externalfiletype;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.Node;
+
+import org.jabref.logic.util.OS;
+
+public class EditExternalFileTypeViewModel {
+
+    private final StringProperty extensionProperty = new SimpleStringProperty("");
+    private final StringProperty nameProperty = new SimpleStringProperty("");
+    private final StringProperty mimeTypeProperty = new SimpleStringProperty("");
+    private final StringProperty selectedApplicationProperty = new SimpleStringProperty("");
+    private final BooleanProperty defaultApplicationSelectedProperty = 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.getFieldName());
+        mimeTypeProperty.setValue(fileType.getMimeType());
+        selectedApplicationProperty.setValue(fileType.getOpenWithApplication());
+        icon = fileType.getIcon().getGraphicNode();
+
+        if (fileType.getOpenWithApplication().isEmpty()) {
+            defaultApplicationSelectedProperty.setValue(true);
+        }
+
+    }
+
+    public StringProperty extensionProperty() {
+        return extensionProperty;
+    }
+
+    public StringProperty nameProperty() {
+        return nameProperty;
+    }
+
+    public StringProperty mimeTypeProperty() {
+        return mimeTypeProperty;
+    }
+
+    public StringProperty selectedApplicationProperty() {
+        return selectedApplicationProperty;
+    }
+
+    public BooleanProperty defaultApplicationSelectedProperty() {
+        return defaultApplicationSelectedProperty;
+    }
+
+    public Node getIcon() {
+        return icon;
+    }
+
+    public void storeSettings() {
+
+        fileType.setName(nameProperty.getValue().trim());
+        fileType.setMimeType(mimeTypeProperty.getValue().trim());
+
+        String ext = extensionProperty.getValue().trim();
+        if (!ext.isEmpty() && (ext.charAt(0) == '.')) {
+            fileType.setExtension(ext.substring(1));
+        } else {
+            fileType.setExtension(ext);
+        }
+
+        String application = selectedApplicationProperty.getValue().trim();
+        if (OS.WINDOWS) {
+            // On Windows, store application as empty if the "Default" option is selected,
+            // or if the application name is empty:
+            if (defaultApplicationSelectedProperty.getValue() || application.isEmpty()) {
+                fileType.setOpenWith("");
+                selectedApplicationProperty.setValue("");
+
+            } else {
+                fileType.setOpenWith(application);
+            }
+        } else {
+            fileType.setOpenWith(application);
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java
deleted file mode 100644
index 676868ac898..00000000000
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.jabref.gui.externalfiletype;
-
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.event.ActionListener;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Optional;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.jabref.Globals;
-import org.jabref.JabRefGUI;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-/**
- * This class produces a dialog box for editing an external file type.
- */
-public class ExternalFileTypeEntryEditor {
-
-    private JDialog diag;
-    private final JTextField extension = new JTextField();
-    private final JTextField name = new JTextField();
-    private final JTextField mimeType = new JTextField();
-    private final JTextField application = new JTextField();
-    private final JLabel icon = new JLabel(IconTheme.JabRefIcons.FILE.getSmallIcon());
-    private final JButton ok = new JButton(Localization.lang("OK"));
-    private final JButton cancel = new JButton(Localization.lang("Cancel"));
-    private final JRadioButton useDefault = new JRadioButton(Localization.lang("Default"));
-    private final JRadioButton other = new JRadioButton("");
-    private final String editFileTitle = Localization.lang("Edit file type");
-    private final String newFileTitle = Localization.lang("Add new file type");
-
-    private CustomExternalFileType entry;
-    private boolean okPressed;
-
-    private final ActionListener browsePressed = e -> {
-        String appDir = application.getText().trim();
-        if (appDir.isEmpty()) {
-            appDir = Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY);
-        }
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(Paths.get(appDir)).build();
-        DialogService ds = JabRefGUI.getMainFrame().getDialogService();
-
-        Optional<Path> path = DefaultTaskExecutor
-                .runInJavaFXThread(() -> ds.showFileOpenDialog(fileDialogConfiguration));
-
-        path.ifPresent(applicationDir -> {
-            if (applicationDir.getParent() != null) {
-                Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, applicationDir.getParent().toString());
-            }
-            application.setText(applicationDir.toString());
-        });
-    };
-
-    public ExternalFileTypeEntryEditor(CustomExternalFileType entry) {
-        init(entry);
-    }
-
-    private void init(CustomExternalFileType inEntry) {
-        entry = inEntry;
-        icon.setText(null);
-
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(useDefault);
-        bg.add(other);
-
-        FormBuilder builder = FormBuilder.create();
-        builder.layout(new FormLayout("left:pref, 4dlu, fill:150dlu, 4dlu, fill:pref",
-                "p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p"));
-        builder.add(Localization.lang("Icon")).xy(1, 1);
-        builder.add(icon).xy(3, 1);
-        builder.add(Localization.lang("Name")).xy(1, 3);
-        builder.add(name).xy(3, 3);
-        builder.add(Localization.lang("Extension")).xy(1, 5);
-        builder.add(extension).xy(3, 5);
-        builder.add(Localization.lang("MIME type")).xy(1, 7);
-        builder.add(mimeType).xy(3, 7);
-        builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        builder.add(Localization.lang("Application")).xy(1, 9);
-        JButton browseBut = new JButton(Localization.lang("Browse"));
-        if (OS.WINDOWS) {
-            builder.add(useDefault).xy(3, 9);
-            builder.appendRows("2dlu, p");
-            JPanel p1 = new JPanel();
-            builder.add(p1).xy(1, 11);
-            JPanel p2 = new JPanel();
-            application.setPreferredSize(new Dimension(300, application.getPreferredSize().height));
-            BorderLayout bl = new BorderLayout();
-            bl.setHgap(4);
-            p2.setLayout(bl);
-            p2.add(other, BorderLayout.WEST);
-            p2.add(application, BorderLayout.CENTER);
-            builder.add(p2).xy(3, 11);
-            builder.add(browseBut).xy(5, 11);
-        } else {
-            builder.add(application).xy(3, 9);
-            builder.add(browseBut).xy(5, 9);
-        }
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-
-        ok.addActionListener(e -> {
-            okPressed = true;
-
-            storeSettings(ExternalFileTypeEntryEditor.this.entry);
-            diag.dispose();
-
-        });
-        cancel.addActionListener(e -> diag.dispose());
-
-        if (OS.WINDOWS) {
-            application.getDocument().addDocumentListener(new DocumentListener() {
-
-                private void handle() {
-                    if (application.getText().isEmpty()) {
-                        useDefault.setSelected(true);
-                    } else {
-                        other.setSelected(true);
-                    }
-                }
-
-                @Override
-                public void insertUpdate(DocumentEvent documentEvent) {
-                    handle();
-                }
-
-                @Override
-                public void removeUpdate(DocumentEvent documentEvent) {
-                    handle();
-                }
-
-                @Override
-                public void changedUpdate(DocumentEvent documentEvent) {
-                    handle();
-                }
-            });
-        }
-
-        String title = editFileTitle;
-
-        if (entry.getName().isEmpty()) {
-            title = newFileTitle;
-        }
-
-        diag = new JDialog((Dialog) null, title, true);
-        diag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-        diag.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-        diag.pack();
-
-        browseBut.addActionListener(browsePressed);
-
-        setValues(entry);
-    }
-
-    public void setVisible(boolean visible) {
-        if (visible) {
-            okPressed = false;
-        }
-        diag.setVisible(visible);
-    }
-
-    private void setValues(ExternalFileType entry) {
-        name.setText(entry.getName());
-        extension.setText(entry.getExtension());
-        mimeType.setText(entry.getMimeType());
-        application.setText(entry.getOpenWithApplication());
-        icon.setIcon(entry.getIcon().getSmallIcon());
-        if (application.getText().isEmpty()) {
-            useDefault.setSelected(true);
-        } else {
-            other.setSelected(true);
-        }
-    }
-
-    private void storeSettings(CustomExternalFileType fileTypeEntry) {
-        fileTypeEntry.setName(name.getText().trim());
-        fileTypeEntry.setMimeType(mimeType.getText().trim());
-        // Set extension, but remove initial dot if user has added that:
-        String ext = extension.getText().trim();
-        if (!ext.isEmpty() && (ext.charAt(0) == '.')) {
-            fileTypeEntry.setExtension(ext.substring(1));
-        } else {
-            fileTypeEntry.setExtension(ext);
-        }
-
-        if (OS.WINDOWS) {
-            // On Windows, store application as empty if the "Default" option is selected,
-            // or if the application name is empty:
-            if (useDefault.isSelected() || application.getText().trim().isEmpty()) {
-                fileTypeEntry.setOpenWith("");
-            } else {
-                fileTypeEntry.setOpenWith(application.getText().trim());
-            }
-        } else {
-            fileTypeEntry.setOpenWith(application.getText().trim());
-        }
-    }
-
-    public boolean okPressed() {
-        return okPressed;
-    }
-
-}