diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f670c647c1..8807730b5bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ The new default removes the linked file from the entry instead of deleting the f
 - We added another CLI functionality for reading and writing metadata to pdfs. (see https://github.com/JabRef/jabref/pull/3756 and see http://help.jabref.org/en/CommandLine)
 - We no longer print errors in field values during autosave into the log [#3811](https://github.com/JabRef/jabref/issues/3811)
 
+
 ### Fixed
 - We fixed several performance problems with the management of journal abbreviations [#3323](https://github.com/JabRef/jabref/issues/3323)
 - We fixed an issue where changing the type of an entry did not update the label in the tool bar of the entry editor and the contents of the currently visible entry editor tab
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index f9469c6a5e3..959e7508b64 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -60,7 +60,6 @@
 import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.filelist.AttachFileAction;
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.groups.GroupAddRemoveDialog;
@@ -292,9 +291,7 @@ public String getTabTitle() {
                 }
             }
         } else if (databaseLocation == DatabaseLocation.SHARED) {
-            title.append(
-                    this.bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared")
-                            + "]");
+            title.append(this.bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]");
         }
 
         return title.toString();
@@ -386,9 +383,8 @@ public void init() {
                 numSelected = entries.size();
 
                 if (entries.isEmpty()) { // None selected. Inform the user to select entries first.
-                    dialogService.showWarningDialogAndWait(
-                            Localization.lang("Autogenerate BibTeX keys"),
-                            Localization.lang("First select the entries you want keys to be generated for."));
+                    dialogService.showWarningDialogAndWait(Localization.lang("Autogenerate BibTeX keys"),
+                                                           Localization.lang("First select the entries you want keys to be generated for."));
                     return;
                 }
                 output(formatOutputMessage(Localization.lang("Generating BibTeX key for"), numSelected));
@@ -405,12 +401,13 @@ public void run() {
                 } else if (Globals.prefs.getBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY)) {
                     if (entries.parallelStream().anyMatch(BibEntry::hasCiteKey)) {
 
-                        boolean overwriteKeysPressed = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Overwrite keys"),
-                                Localization.lang("One or more keys will be overwritten. Continue?"),
-                                Localization.lang("Overwrite keys"),
-                                Localization.lang("Cancel"),
-                                Localization.lang("Disable this confirmation dialog"),
-                                optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
+                        boolean overwriteKeysPressed = dialogService.showConfirmationDialogWithOptOutAndWait(
+                                                                                                             Localization.lang("Overwrite keys"),
+                                                                                                             Localization.lang("One or more keys will be overwritten. Continue?"),
+                                                                                                             Localization.lang("Overwrite keys"),
+                                                                                                             Localization.lang("Cancel"),
+                                                                                                             Localization.lang("Disable this confirmation dialog"),
+                                                                                                             optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
 
                         // The user doesn't want to overide cite keys
                         if (!overwriteKeysPressed) {
@@ -467,29 +464,21 @@ public void update() {
         // The action for copying the BibTeX key and the title for the first selected entry
         actions.put(Actions.COPY_KEY_AND_TITLE, (BaseAction) () -> copyKeyAndTitle());
 
-        actions.put(Actions.COPY_CITATION_ASCII_DOC,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
-        actions.put(Actions.COPY_CITATION_XSLFO,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
-        actions.put(Actions.COPY_CITATION_HTML,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
-        actions.put(Actions.COPY_CITATION_RTF,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
-        actions.put(Actions.COPY_CITATION_TEXT,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
+        actions.put(Actions.COPY_CITATION_ASCII_DOC, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
+        actions.put(Actions.COPY_CITATION_XSLFO, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
+        actions.put(Actions.COPY_CITATION_HTML, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
+        actions.put(Actions.COPY_CITATION_RTF, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
+        actions.put(Actions.COPY_CITATION_TEXT, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
 
         // The action for copying the BibTeX keys as hyperlinks to the urls of the selected entries
         actions.put(Actions.COPY_KEY_AND_LINK, new CopyBibTeXKeyAndLinkAction(mainTable));
 
         actions.put(Actions.MERGE_DATABASE, new AppendDatabaseAction(frame, this));
 
-        actions.put(Actions.ADD_FILE_LINK, new AttachFileAction(this));
-
         actions.put(Actions.OPEN_EXTERNAL_FILE, (BaseAction) () -> openExternalFile());
 
         actions.put(Actions.OPEN_FOLDER, (BaseAction) () -> JabRefExecutorService.INSTANCE.execute(() -> {
-            final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(),
-                    bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+            final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(), bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
             for (final Path f : files) {
                 try {
                     JabRefDesktop.openFolderAndSelectFile(f.toAbsolutePath());
@@ -500,12 +489,12 @@ public void update() {
         }));
 
         actions.put(Actions.OPEN_CONSOLE, (BaseAction) () -> JabRefDesktop
-                .openConsole(frame.getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null)));
+                                                                          .openConsole(frame.getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null)));
 
         actions.put(Actions.PULL_CHANGES_FROM_SHARED_DATABASE, (BaseAction) () -> {
             DatabaseSynchronizer dbmsSynchronizer = frame.getCurrentBasePanel()
-                    .getBibDatabaseContext()
-                    .getDBMSSynchronizer();
+                                                         .getBibDatabaseContext()
+                                                         .getDBMSSynchronizer();
             dbmsSynchronizer.pullChanges();
         });
 
@@ -546,35 +535,33 @@ public void update() {
 
         // Note that we can't put the number of entries that have been reverted into the undoText as the concrete number cannot be injected
         actions.put(new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(
-                        SpecialField.RELEVANCE.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(SpecialField.RELEVANCE.getValues().get(0), frame));
+
         actions.put(new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.QUALITY, undoManager)
-                        .getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.QUALITY, undoManager).getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
+
         actions.put(new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(
-                        SpecialField.PRINTED.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(SpecialField.PRINTED.getValues().get(0), frame));
 
         for (SpecialFieldValue prio : SpecialField.PRIORITY.getValues()) {
             actions.put(new SpecialFieldValueViewModel(prio).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
+                        new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
         }
         for (SpecialFieldValue rank : SpecialField.RANKING.getValues()) {
             actions.put(new SpecialFieldValueViewModel(rank).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
+                        new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
         }
         for (SpecialFieldValue status : SpecialField.READ_STATUS.getValues()) {
             actions.put(new SpecialFieldValueViewModel(status).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
+                        new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
         }
 
         actions.put(Actions.TOGGLE_PREVIEW, (BaseAction) () -> {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences();
             boolean enabled = !previewPreferences.isPreviewPanelEnabled();
-            PreviewPreferences newPreviewPreferences = previewPreferences
-                    .getBuilder()
-                    .withPreviewPanelEnabled(enabled)
-                    .build();
+            PreviewPreferences newPreviewPreferences = previewPreferences.getBuilder()
+                                                                         .withPreviewPanelEnabled(enabled)
+                                                                         .build();
             Globals.prefs.storePreviewPreferences(newPreviewPreferences);
             DefaultTaskExecutor.runInJavaFXThread(() -> setPreviewActiveBasePanels(enabled));
         });
@@ -648,11 +635,9 @@ private void delete(boolean cut, List<BibEntry> entries) {
 
         NamedCompound compound;
         if (cut) {
-            compound = new NamedCompound(
-                    (entries.size() > 1 ? Localization.lang("cut entries") : Localization.lang("cut entry")));
+            compound = new NamedCompound((entries.size() > 1 ? Localization.lang("cut entries") : Localization.lang("cut entry")));
         } else {
-            compound = new NamedCompound(
-                    (entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
+            compound = new NamedCompound((entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
         }
         for (BibEntry entry : entries) {
             compound.addEdit(new UndoableRemoveEntry(bibDatabaseContext.getDatabase(), entry, BasePanel.this));
@@ -663,8 +648,7 @@ private void delete(boolean cut, List<BibEntry> entries) {
         getUndoManager().addEdit(compound);
 
         markBaseChanged();
-        frame.output(
-                formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
+        frame.output(formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
 
         // prevent the main table from loosing focus
         mainTable.requestFocus();
@@ -679,9 +663,9 @@ private void copyTitle() {
         if (!selectedBibEntries.isEmpty()) {
             // Collect all non-null titles.
             List<String> titles = selectedBibEntries.stream()
-                    .filter(bibEntry -> bibEntry.getTitle().isPresent())
-                    .map(bibEntry -> bibEntry.getTitle().get())
-                    .collect(Collectors.toList());
+                                                    .filter(bibEntry -> bibEntry.getTitle().isPresent())
+                                                    .map(bibEntry -> bibEntry.getTitle().get())
+                                                    .collect(Collectors.toList());
 
             if (titles.isEmpty()) {
                 output(Localization.lang("None of the selected entries have titles."));
@@ -692,12 +676,9 @@ private void copyTitle() {
 
             if (titles.size() == selectedBibEntries.size()) {
                 // All entries had titles.
-                output((selectedBibEntries.size() > 1 ? Localization.lang("Copied titles") : Localization
-                        .lang("Copied title")) + '.');
+                output((selectedBibEntries.size() > 1 ? Localization.lang("Copied titles") : Localization.lang("Copied title")) + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined title.",
-                        Integer.toString(selectedBibEntries.size() - titles.size()),
-                        Integer.toString(selectedBibEntries.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined title.", Integer.toString(selectedBibEntries.size() - titles.size()), Integer.toString(selectedBibEntries.size())));
             }
         }
     }
@@ -717,8 +698,8 @@ private void copyCiteKey() {
 
             String sb = String.join(",", keys);
             String citeCommand = Optional.ofNullable(Globals.prefs.get(JabRefPreferences.CITE_COMMAND))
-                    .filter(cite -> cite.contains("\\")) // must contain \
-                    .orElse("\\cite");
+                                         .filter(cite -> cite.contains("\\")) // must contain \
+                                         .orElse("\\cite");
             StringSelection ss = new StringSelection(citeCommand + "{" + sb + '}');
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, BasePanel.this);
 
@@ -726,8 +707,7 @@ private void copyCiteKey() {
                 // All entries had keys.
                 output(bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key") + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                        Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
             }
         }
     }
@@ -752,8 +732,7 @@ private void copyKey() {
                 // All entries had keys.
                 output((bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key")) + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                        Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
             }
         }
     }
@@ -762,13 +741,11 @@ private void copyKeyAndTitle() {
         List<BibEntry> bes = mainTable.getSelectedEntries();
         if (!bes.isEmpty()) {
             // OK: in a future version, this string should be configurable to allow arbitrary exports
-            StringReader sr = new StringReader(
-                    "\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
+            StringReader sr = new StringReader("\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
             Layout layout;
             try {
-                layout = new LayoutHelper(sr,
-                        Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
-                                .getLayoutFromText();
+                layout = new LayoutHelper(sr, Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
+                                                                                                                             .getLayoutFromText();
             } catch (IOException e) {
                 LOGGER.info("Could not get layout", e);
                 return;
@@ -797,8 +774,7 @@ private void copyKeyAndTitle() {
                 // All entries had keys.
                 output((bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key")) + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                        Integer.toString(bes.size() - copied), Integer.toString(bes.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", Integer.toString(bes.size() - copied), Integer.toString(bes.size())));
             }
         }
     }
@@ -825,8 +801,7 @@ private void openExternalFile() {
                 return;
             }
             FileListEntry flEntry = fileListTableModel.getEntry(0);
-            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), entry, "", flEntry.getLink(),
-                    flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
+            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(), flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
             item.doClick();
         });
     }
@@ -855,16 +830,14 @@ public void runCommand(final Actions command) {
         }
     }
 
-    private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
-            SavePreferences.DatabaseSaveType saveType) throws SaveException {
+    private boolean saveDatabase(File file, boolean selectedOnly, Charset enc, SavePreferences.DatabaseSaveType saveType) throws SaveException {
         SaveSession session;
         final String SAVE_DATABASE = Localization.lang("Save library");
         try {
             SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs)
-                    .withEncoding(enc)
-                    .withSaveType(saveType);
-            BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
-                    FileSaveSession::new);
+                                                   .withEncoding(enc)
+                                                   .withSaveType(saveType);
+            BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
             if (selectedOnly) {
                 session = databaseWriter.savePartOfDatabase(bibDatabaseContext, mainTable.getSelectedEntries(), prefs);
             } else {
@@ -875,10 +848,8 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
         }
         // FIXME: not sure if this is really thrown anywhere
         catch (UnsupportedCharsetException ex) {
-            JOptionPane.showMessageDialog(null,
-                    Localization.lang("Could not save file.") + ' '
-                            + Localization.lang("Character encoding '%0' is not supported.", enc.displayName()),
-                    SAVE_DATABASE, JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, Localization.lang("Could not save file.") + ' '
+                    + Localization.lang("Character encoding '%0' is not supported.", enc.displayName()), SAVE_DATABASE, JOptionPane.ERROR_MESSAGE);
             throw new SaveException("rt");
         } catch (SaveException ex) {
             if (ex.specificEntry()) {
@@ -889,33 +860,26 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
                 LOGGER.warn("Could not save", ex);
             }
 
-            dialogService.showErrorDialogAndWait(
-                    SAVE_DATABASE,
-                    Localization.lang("Could not save file."),
-                    ex);
+            dialogService.showErrorDialogAndWait(SAVE_DATABASE, Localization.lang("Could not save file."), ex);
             throw new SaveException("rt");
         }
 
         boolean commit = true;
         if (!session.getWriter().couldEncodeAll()) {
             FormBuilder builder = FormBuilder.create()
-                    .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
+                                             .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
             JTextArea ta = new JTextArea(session.getWriter().getProblemCharacters());
             ta.setEditable(false);
-            builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:",
-                    session.getEncoding().displayName())).xy(1, 1);
+            builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:", session.getEncoding().displayName())).xy(1, 1);
             builder.add(ta).xy(3, 1);
             builder.add(Localization.lang("What do you want to do?")).xy(1, 3);
             String tryDiff = Localization.lang("Try different encoding");
-            int answer = JOptionPane.showOptionDialog(null, builder.getPanel(), SAVE_DATABASE,
-                    JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null,
-                    new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
+            int answer = JOptionPane.showOptionDialog(null, builder.getPanel(), SAVE_DATABASE, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
 
             if (answer == JOptionPane.NO_OPTION) {
 
                 // The user wants to use another encoding.
-                Object choice = JOptionPane.showInputDialog(null, Localization.lang("Select encoding"), SAVE_DATABASE,
-                        JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, enc);
+                Object choice = JOptionPane.showInputDialog(null, Localization.lang("Select encoding"), SAVE_DATABASE, JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, enc);
                 if (choice == null) {
                     commit = false;
                 } else {
@@ -1053,12 +1017,12 @@ private void createMainTable() {
 
         // Update entry editor and preview according to selected entries
         mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
-                .stream()
-                .findFirst()
-                .ifPresent(entry -> {
-                    preview.setEntry(entry);
-                    entryEditor.setEntry(entry);
-                }));
+                                                         .stream()
+                                                         .findFirst()
+                                                         .ifPresent(entry -> {
+                                                             preview.setEntry(entry);
+                                                             entryEditor.setEntry(entry);
+                                                         }));
 
         // TODO: Register these actions globally
         /*
@@ -1186,8 +1150,8 @@ public void setupMainPanel() {
         // Saves the divider position as soon as it changes
         // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
         dividerPositionSubscription = EasyBind.monadic(Bindings.valueAt(splitPane.getDividers(), 0))
-                .flatMap(SplitPane.Divider::positionProperty)
-                .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
+                                              .flatMap(SplitPane.Divider::positionProperty)
+                                              .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
     }
 
     /**
@@ -1320,9 +1284,9 @@ public void previousPreviewStyle() {
 
     private void cyclePreview(int newPosition) {
         PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-                .getBuilder()
-                .withPreviewCyclePosition(newPosition)
-                .build();
+                                                             .getBuilder()
+                                                             .withPreviewCyclePosition(newPosition)
+                                                             .build();
         Globals.prefs.storePreviewPreferences(previewPreferences);
 
         preview.updateLayout(previewPreferences);
@@ -1509,10 +1473,12 @@ public boolean showDeleteConfirmationDialog(int numberOfEntries) {
                 cancelButton = Localization.lang("Keep entries");
             }
 
-            return dialogService.showConfirmationDialogWithOptOutAndWait(title, message,
-                    okButton, cancelButton,
-                    Localization.lang("Disable this confirmation dialog"),
-                    optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
+            return dialogService.showConfirmationDialogWithOptOutAndWait(title,
+                                                                         message,
+                                                                         okButton,
+                                                                         cancelButton,
+                                                                         Localization.lang("Disable this confirmation dialog"),
+                                                                         optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
         } else {
             return true;
         }
@@ -1552,9 +1518,9 @@ private void saveDividerLocation(Number position) {
 
         if (mode == BasePanelMode.SHOWING_PREVIEW) {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-                    .getBuilder()
-                    .withPreviewPanelDividerPosition(position)
-                    .build();
+                                                                 .getBuilder()
+                                                                 .withPreviewPanelDividerPosition(position)
+                                                                 .build();
             Globals.prefs.storePreviewPreferences(previewPreferences);
         } else if (mode == BasePanelMode.SHOWING_EDITOR) {
             preferences.setEntryEditorDividerPosition(position.doubleValue());
@@ -1629,8 +1595,7 @@ private BibEntry getShowing() {
     }
 
     public String formatOutputMessage(String start, int count) {
-        return String.format("%s %d %s.", start, count,
-                (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+        return String.format("%s %d %s.", start, count, (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
     }
 
     /**
@@ -1858,16 +1823,18 @@ public void action() {
                     List<LinkedFile> files = bes.get(0).getFiles();
 
                     Optional<LinkedFile> linkedFile = files.stream()
-                            .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                                    || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                                    || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
-                            .findFirst();
+                                                           .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
+                                                                   || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                                                                   || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                                                           .findFirst();
 
                     if (linkedFile.isPresent()) {
 
                         try {
 
-                            JabRefDesktop.openExternalFileAnyFormat(bibDatabaseContext, linkedFile.get().getLink(), ExternalFileTypes.getInstance().fromLinkedFile(linkedFile.get(), true));
+                            JabRefDesktop.openExternalFileAnyFormat(bibDatabaseContext,
+                                                                    linkedFile.get().getLink(),
+                                                                    ExternalFileTypes.getInstance().fromLinkedFile(linkedFile.get(), true));
 
                             output(Localization.lang("External viewer called") + '.');
                         } catch (IOException e) {
@@ -1920,10 +1887,10 @@ public SaveSelectedAction(SavePreferences.DatabaseSaveType saveType) {
         @Override
         public void action() throws SaveException {
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .withDefaultExtension(FileType.BIBTEX_DB)
-                    .addExtensionFilter(FileType.BIBTEX_DB)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
+                                                                                                   .withDefaultExtension(FileType.BIBTEX_DB)
+                                                                                                   .addExtensionFilter(FileType.BIBTEX_DB)
+                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                                   .build();
 
             Optional<Path> chosenFile = dialogService.showFileSaveDialog(fileDialogConfiguration);
             if (chosenFile.isPresent()) {
diff --git a/src/main/java/org/jabref/gui/actions/CopyFilesAction.java b/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
index 39ea9b34d4c..5efa6415506 100644
--- a/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
@@ -48,7 +48,7 @@ private void showDialog(List<CopyFilesResultItemViewModel> data) {
             return;
         }
         CopyFilesDialogView dialog = new CopyFilesDialogView(databaseContext, new CopyFilesResultListDependency(data));
-        dialog.show();
+        dialog.showAndWait();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index eb0ea857b9b..0d581cc8333 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -34,7 +34,7 @@ public enum StandardActions implements Action {
     OPEN_EXTERNAL_FILE(Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
     OPEN_URL(Localization.lang("Open URL or DOI"), IconTheme.JabRefIcons.WWW, KeyBinding.OPEN_URL_OR_DOI),
     MERGE_WITH_FETCHED_ENTRY(Localization.lang("Get BibTeX data from %0", "DOI/ISBN/...")),
-    ADD_FILE_LINK(Localization.lang("Attach file"), IconTheme.JabRefIcons.ATTACH_FILE),
+    ATTACH_FILE(Localization.lang("Attach file"), IconTheme.JabRefIcons.ATTACH_FILE),
     ADD_TO_GROUP(Localization.lang("Add to group")),
     REMOVE_FROM_GROUP(Localization.lang("Remove from group")),
     MOVE_TO_GROUP(Localization.lang("Move to group")),
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml
index 671b569acf3..6e7bb95f5f2 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml
@@ -23,13 +23,6 @@
                </columnResizePolicy>
             </TableView>
          </center>
-         <bottom>
-            <ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-               <buttons>
-                  <Button defaultButton="true" mnemonicParsing="false" onAction="#close" text="%OK" ButtonBar.buttonData="OK_DONE" />
-               </buttons>
-            </ButtonBar>
-         </bottom>
       </BorderPane>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index cd4b33832ea..bbf813c4c14 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.copyfiles;
 
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.paint.Color;
@@ -28,16 +28,13 @@ public CopyFilesDialogView(BibDatabaseContext bibDatabaseContext, CopyFilesResul
         this.setTitle(Localization.lang("Result"));
         this.setResizable(true);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.OK);
 
         viewModel = new CopyFilesDialogViewModel(results);
-    }
 
-    @FXML
-    private void close(@SuppressWarnings("unused") ActionEvent event) {
-        close();
+        ViewLoader.view(this)
+                  .load()
+                  .setAsContent(this.getDialogPane());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 59da9ae64c0..21c6e4ec424 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -5,38 +5,26 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
 import org.jabref.Globals;
 import org.jabref.JabRefGUI;
 import org.jabref.gui.ClipBoardManager;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.os.DefaultDesktop;
 import org.jabref.gui.desktop.os.Linux;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.desktop.os.OSX;
 import org.jabref.gui.desktop.os.Windows;
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypeEntryEditor;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
-import org.jabref.gui.filelist.FileListEntry;
-import org.jabref.gui.filelist.FileListEntryEditor;
-import org.jabref.gui.filelist.FileListTableModel;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Eprint;
@@ -64,7 +52,8 @@ private JabRefDesktop() {
      * Open a http/pdf/ps viewer for the given link string.
      */
     public static void openExternalViewer(BibDatabaseContext databaseContext, String initialLink,
-            String initialFieldName) throws IOException {
+                                          String initialFieldName)
+        throws IOException {
         String link = initialLink;
         String fieldName = initialFieldName;
         if (FieldName.PS.equals(fieldName) || FieldName.PDF.equals(fieldName)) {
@@ -85,7 +74,7 @@ public static void openExternalViewer(BibDatabaseContext databaseContext, String
                 if ("pdf".equalsIgnoreCase(split[split.length - 1])) {
                     fieldName = FieldName.PDF;
                 } else if ("ps".equalsIgnoreCase(split[split.length - 1])
-                        || ((split.length >= 3) && "ps".equalsIgnoreCase(split[split.length - 2]))) {
+                           || ((split.length >= 3) && "ps".equalsIgnoreCase(split[split.length - 2]))) {
                     fieldName = FieldName.PS;
                 }
             }
@@ -132,7 +121,8 @@ private static void openDoi(String doi) throws IOException {
      * @return false if the link couldn't be resolved, true otherwise.
      */
     public static boolean openExternalFileAnyFormat(final BibDatabaseContext databaseContext, String link,
-            final Optional<ExternalFileType> type) throws IOException {
+                                                    final Optional<ExternalFileType> type)
+        throws IOException {
 
         if (REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()) {
             openExternalFilePlatformIndependent(type, link);
@@ -156,7 +146,7 @@ public static boolean openExternalFileAnyFormat(Path file, final BibDatabaseCont
     }
 
     private static void openExternalFilePlatformIndependent(Optional<ExternalFileType> fileType, String filePath)
-            throws IOException {
+        throws IOException {
         if (fileType.isPresent()) {
             String application = fileType.get().getOpenWithApplication();
 
@@ -168,82 +158,6 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
         }
     }
 
-    public static boolean openExternalFileUnknown(JabRefFrame frame, BibEntry entry, BibDatabaseContext databaseContext,
-            String link, UnknownExternalFileType fileType) throws IOException {
-
-        String cancelMessage = Localization.lang("Unable to open file.");
-        String[] options = new String[] {Localization.lang("Define '%0'", fileType.getName()),
-                Localization.lang("Change file type"), Localization.lang("Cancel")};
-        String defOption = options[0];
-        int answer = JOptionPane.showOptionDialog(null,
-                Localization.lang("This external link is of the type '%0', which is undefined. What do you want to do?",
-                        fileType.getName()),
-                Localization.lang("Undefined file type"), JOptionPane.YES_NO_CANCEL_OPTION,
-                JOptionPane.QUESTION_MESSAGE, null, options, defOption);
-        if (answer == JOptionPane.CANCEL_OPTION) {
-            frame.output(cancelMessage);
-            return false;
-        } else if (answer == JOptionPane.YES_OPTION) {
-            // User wants to define the new file type. Show the dialog:
-
-            ExternalFileType newType = new ExternalFileType(fileType.getName(), "", "", "", "new", IconTheme.JabRefIcons.FILE);
-            ExternalFileTypeEntryEditor editor = new ExternalFileTypeEntryEditor((JFrame) null, newType);
-
-            editor.setVisible(true);
-            if (editor.okPressed()) {
-                // Get the old list of types, add this one, and update the list in prefs:
-                List<ExternalFileType> fileTypes = new ArrayList<>(
-                        ExternalFileTypes.getInstance().getExternalFileTypeSelection());
-                fileTypes.add(newType);
-                Collections.sort(fileTypes);
-                ExternalFileTypes.getInstance().setExternalFileTypes(fileTypes);
-                // Finally, open the file:
-                return openExternalFileAnyFormat(databaseContext, link, Optional.of(newType));
-            } else {
-                // Canceled:
-                frame.output(cancelMessage);
-                return false;
-            }
-        } else {
-            // User wants to change the type of this link.
-            // First get a model of all file links for this entry:
-            FileListTableModel tModel = new FileListTableModel();
-            Optional<String> oldValue = entry.getField(FieldName.FILE);
-            oldValue.ifPresent(tModel::setContent);
-            FileListEntry flEntry = null;
-            // Then find which one we are looking at:
-            for (int i = 0; i < tModel.getRowCount(); i++) {
-                FileListEntry iEntry = tModel.getEntry(i);
-                if (iEntry.getLink().equals(link)) {
-                    flEntry = iEntry;
-                    break;
-                }
-            }
-            if (flEntry == null) {
-                // This shouldn't happen, so I'm not sure what to put in here:
-                throw new RuntimeException("Could not find the file list entry " + link + " in " + entry);
-            }
-
-            FileListEntryEditor editor = new FileListEntryEditor(flEntry.toParsedFileField(), false, true, databaseContext);
-            editor.setVisible(true, false);
-            if (editor.okPressed()) {
-                // Store the changes and add an undo edit:
-                String newValue = tModel.getStringRepresentation();
-                UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE, oldValue.orElse(null),
-                        newValue);
-                entry.setField(FieldName.FILE, newValue);
-                frame.getCurrentBasePanel().getUndoManager().addEdit(ce);
-                frame.getCurrentBasePanel().markBaseChanged();
-                // Finally, open the link:
-                return openExternalFileAnyFormat(databaseContext, flEntry.getLink(), flEntry.getType());
-            } else {
-                // Canceled:
-                frame.output(cancelMessage);
-                return false;
-            }
-        }
-    }
-
     /**
      * Opens a file browser of the folder of the given file. If possible, the file is selected
      * @param fileLink the location of the file
@@ -284,8 +198,11 @@ public static void openBrowserShowPopup(String url) {
             String openManually = Localization.lang("Please open %0 manually.", url);
             String copiedToClipboard = Localization.lang("The link has been copied to the clipboard.");
             JabRefGUI.getMainFrame().output(couldNotOpenBrowser);
-            JOptionPane.showMessageDialog(null, couldNotOpenBrowser + "\n" + openManually + "\n" +
-                    copiedToClipboard, couldNotOpenBrowser, JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null,
+                                          couldNotOpenBrowser + "\n" + openManually + "\n" +
+                                                copiedToClipboard,
+                                          couldNotOpenBrowser,
+                                          JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -327,9 +244,9 @@ public static void openConsole(File file) throws IOException {
                     LOGGER.error("Open console", exception);
 
                     JOptionPane.showMessageDialog(null,
-                            Localization.lang("Error occured while executing the command \"%0\".", commandLoggingText),
-                            Localization.lang("Open console") + " - " + Localization.lang("Error"),
-                            JOptionPane.ERROR_MESSAGE);
+                                                  Localization.lang("Error occured while executing the command \"%0\".", commandLoggingText),
+                                                  Localization.lang("Open console") + " - " + Localization.lang("Error"),
+                                                  JOptionPane.ERROR_MESSAGE);
                     JabRefGUI.getMainFrame().output(null);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
index 81d747347df..e636858d6e9 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
@@ -7,13 +7,12 @@
 
 import javax.swing.Icon;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileHelper;
 
 import org.slf4j.Logger;
@@ -25,30 +24,28 @@
  * to process the request if the user clicks this menu item.
  */
 public class ExternalFileMenuItem extends JMenuItem implements ActionListener {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFileMenuItem.class);
 
-    private final BibEntry entry;
     private final String link;
     private final BibDatabaseContext databaseContext;
     private Optional<ExternalFileType> fileType;
     private final JabRefFrame frame;
     private String fieldName;
 
-
-    public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, String link, Icon icon,
-            BibDatabaseContext databaseContext, Optional<ExternalFileType> fileType) {
+    public ExternalFileMenuItem(JabRefFrame frame, String name, String link, Icon icon,
+                                BibDatabaseContext databaseContext, Optional<ExternalFileType> fileType) {
         super(name, icon);
         this.frame = frame;
-        this.entry = entry;
         this.link = link;
         this.databaseContext = databaseContext;
         this.fileType = fileType;
         addActionListener(this);
     }
 
-    public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, String link, Icon icon,
-            BibDatabaseContext databaseContext, String fieldName) {
-        this(frame, entry, name, link, icon, databaseContext, Optional.empty());
+    public ExternalFileMenuItem(JabRefFrame frame, String name, String link, Icon icon,
+                                BibDatabaseContext databaseContext, String fieldName) {
+        this(frame, name, link, icon, databaseContext, Optional.empty());
         this.fieldName = fieldName;
     }
 
@@ -77,12 +74,7 @@ private boolean openLink() {
                 }
             }
 
-            if (type.isPresent() && (type.get() instanceof UnknownExternalFileType)) {
-                return JabRefDesktop.openExternalFileUnknown(frame, entry, databaseContext, link,
-                        (UnknownExternalFileType) type.get());
-            } else {
-                return JabRefDesktop.openExternalFileAnyFormat(databaseContext, link, type);
-            }
+            return JabRefDesktop.openExternalFileAnyFormat(databaseContext, link, type);
 
         } catch (IOException ex) {
             // See if we should show an error message concerning the application to open the
@@ -90,12 +82,13 @@ private boolean openLink() {
             // application link. If that link is referred by the error message, we can assume
             // that the problem is in the open-with-application setting:
             if ((fileType.isPresent()) && (!fileType.get().getOpenWithApplication().isEmpty())
-                    && ex.getMessage().contains(fileType.get().getOpenWithApplication())) {
+            && ex.getMessage().contains(fileType.get().getOpenWithApplication())) {
+
+                DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showErrorDialogAndWait(Localization.lang("Could not open link"),
+                Localization.lang("Unable to open link. " + "The application '%0' associated with the file type '%1' could not be called.",
+                fileType.get().getOpenWithApplication(),
+                fileType.get().getName())));
 
-                JOptionPane.showMessageDialog(null, Localization.lang("Unable to open link. "
-                                        + "The application '%0' associated with the file type '%1' could not be called.",
-                        fileType.get().getOpenWithApplication(), fileType.get().getName()),
-                        Localization.lang("Could not open link"), JOptionPane.ERROR_MESSAGE);
                 return false;
             }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 137a8d68394..04f84935594 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.swing.SwingUtilities;
 import javax.xml.transform.TransformerException;
 
 import javafx.beans.Observable;
@@ -30,7 +29,7 @@
 import org.jabref.gui.externalfiles.FileDownloadTask;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.filelist.FileListEntryEditor;
+import org.jabref.gui.filelist.LinkedFileEditDialogView;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.BackgroundTask;
@@ -164,9 +163,7 @@ public void open() {
             Optional<ExternalFileType> type = ExternalFileTypes.getInstance().fromLinkedFile(linkedFile, true);
             boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, linkedFile.getLink(), type);
             if (!successful) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("File not found"),
-                                                     Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+                dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
             }
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(Localization.lang("Error opening file '%0'.", linkedFile.getLink()), e);
@@ -206,36 +203,27 @@ public void rename() {
         }
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
         if (!fileDir.isPresent()) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Rename file"),
-                                                 Localization.lang("File directory is not set or does not exist!"));
+            dialogService.showErrorDialogAndWait(Localization.lang("Rename file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
         Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
         if ((file.isPresent()) && Files.exists(file.get())) {
-            RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false,
-                                                               databaseContext,
-                                                               fileDirPattern,
-                                                               fileDirectoryPreferences, linkedFile);
+            RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false, databaseContext, fileDirPattern, fileDirectoryPreferences, linkedFile);
 
             String targetFileName = pdfCleanup.getTargetFileName(linkedFile, entry);
 
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                                                                          Localization.lang("Rename file"),
+            boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Rename file"),
                                                                           Localization.lang("Rename file to") + " " + targetFileName,
                                                                           Localization.lang("Rename file"),
                                                                           Localization.lang("Cancel"));
 
             if (confirm) {
                 Optional<Path> fileConflictCheck = pdfCleanup.findExistingFile(linkedFile, entry);
-
                 performRenameWithConflictCheck(file, pdfCleanup, targetFileName, fileConflictCheck);
             }
         } else {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("File not found"),
-                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -245,23 +233,20 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
             try {
                 pdfCleanup.cleanupWithException(entry);
             } catch (IOException e) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("Rename failed"),
-                                                     Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
             }
         } else {
-            confirm = dialogService.showConfirmationDialogAndWait(
-                                                                  Localization.lang("File exists"),
+            confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("File exists"),
                                                                   Localization.lang("'%0' exists. Overwrite file?", targetFileName),
                                                                   Localization.lang("Overwrite"),
                                                                   Localization.lang("Cancel"));
+
             if (confirm) {
                 try {
                     FileUtil.renameFileWithException(fileConflictCheck.get(), file.get(), true);
                     pdfCleanup.cleanupWithException(entry);
                 } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(
-                                                         Localization.lang("Rename failed"),
+                    dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"),
                                                          Localization.lang("JabRef cannot access the file because it is being used by another process."));
                 }
             }
@@ -277,33 +262,22 @@ public void moveToDefaultDirectory() {
         // Get target folder
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
         if (!fileDir.isPresent()) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Move file"),
-                                                 Localization.lang("File directory is not set or does not exist!"));
+            dialogService.showErrorDialogAndWait(Localization.lang("Move file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
         Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
         if ((file.isPresent()) && Files.exists(file.get())) {
             // Linked file exists, so move it
-            MoveFilesCleanup moveFiles = new MoveFilesCleanup(databaseContext,
-                                                              fileDirPattern,
-                                                              fileDirectoryPreferences,
-                                                              linkedFile);
-
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                                                                          Localization.lang("Move file"),
-                                                                          Localization.lang("Move file to file directory?") + " " + fileDir.get(),
-                                                                          Localization.lang("Move file"),
-                                                                          Localization.lang("Cancel"));
+            MoveFilesCleanup moveFiles = new MoveFilesCleanup(databaseContext, fileDirPattern, fileDirectoryPreferences, linkedFile);
+
+            boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Move file"), Localization.lang("Move file to file directory?") + " " + fileDir.get(), Localization.lang("Move file"), Localization.lang("Cancel"));
             if (confirm) {
                 moveFiles.cleanup(entry);
             }
         } else {
             // File doesn't exist, so we can't move it.
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("File not found"),
-                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -320,9 +294,7 @@ public boolean delete(FileDirectoryPreferences prefs) {
         Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
                                                                                       Localization.lang("Delete '%0'", file.get().toString()),
                                                                                       Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
-                                                                                      removeFromEntry,
-                                                                                      deleteFromEntry,
-                                                                                      ButtonType.CANCEL);
+                                                                                      removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -330,14 +302,11 @@ public boolean delete(FileDirectoryPreferences prefs) {
             }
 
             if (buttonType.get().equals(deleteFromEntry)) {
-
                 try {
                     Files.delete(file.get());
                     return true;
                 } catch (IOException ex) {
-                    dialogService.showErrorDialogAndWait(
-                                                         Localization.lang("Cannot delete file"),
-                                                         Localization.lang("File permission error"));
+                    dialogService.showErrorDialogAndWait(Localization.lang("Cannot delete file"), Localization.lang("File permission error"));
                     LOGGER.warn("File permission error while deleting: " + linkedFile, ex);
                 }
             }
@@ -346,8 +315,15 @@ public boolean delete(FileDirectoryPreferences prefs) {
     }
 
     public void edit() {
-        FileListEntryEditor editor = new FileListEntryEditor(linkedFile, false, true, databaseContext);
-        SwingUtilities.invokeLater(() -> editor.setVisible(true, false));
+
+        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(this.linkedFile);
+
+        Optional<LinkedFile> editedFile = dialog.showAndWait();
+        editedFile.ifPresent(file -> {
+            this.linkedFile.setLink(file.getLink());
+            this.linkedFile.setDescription(file.getDescription());
+            this.linkedFile.setFileType(file.getFileType());
+        });
     }
 
     public void writeXMPMetadata() {
@@ -387,9 +363,7 @@ public void download() {
 
             Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
             if (!targetDirectory.isPresent()) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("Download file"),
-                                                     Localization.lang("File directory is not set or does not exist!"));
+                dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
                 return;
             }
             String suffix = suggestedType.map(ExternalFileType::getExtension).orElse("");
@@ -401,15 +375,12 @@ public void download() {
                                                                                                               LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
                                                                                                               linkedFile.setLink(newLinkedFile.getLink());
                                                                                                               linkedFile.setFileType(newLinkedFile.getFileType());
-                                                                                                          })
-                                                                                                          .onFailure(ex -> dialogService.showErrorDialogAndWait("Download failed", ex));
+                                                                                                          }).onFailure(ex -> dialogService.showErrorDialogAndWait("Download failed", ex));
 
             downloadProgress.bind(downloadTask.workDonePercentageProperty());
             taskExecutor.execute(downloadTask);
         } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Invalid URL"),
-                                                 exception);
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 432f4fc75a6..70285312836 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -2,43 +2,54 @@
 
 import java.util.Optional;
 
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
-import org.jabref.gui.actions.BaseAction;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.JabRefPreferences;
 
-public class AttachFileAction implements BaseAction {
+public class AttachFileAction extends SimpleCommand {
 
     private final BasePanel panel;
+    private final DialogService dialogService;
 
-    public AttachFileAction(BasePanel panel) {
+    public AttachFileAction(BasePanel panel, DialogService dialogService) {
         this.panel = panel;
+        this.dialogService = dialogService;
     }
 
     @Override
-    public void action() {
+    public void execute() {
         if (panel.getSelectedEntries().size() != 1) {
             panel.output(Localization.lang("This operation requires exactly one item to be selected."));
             return;
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
-        LinkedFile flEntry = new LinkedFile("", "", "");
-        FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
-                panel.getBibDatabaseContext());
-        editor.setVisible(true, true);
-        if (editor.okPressed()) {
-            Optional<FieldChange> fieldChange = entry.addFile(flEntry);
-
-            if (fieldChange.isPresent()) {
-                UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
-                        entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
-                panel.getUndoManager().addEdit(ce);
-                panel.markBaseChanged();
-            }
-        }
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                                                                                               .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                               .build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
+            LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), "");
+
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(newLinkedFile);
+
+            Optional<LinkedFile> editedLinkeDfile = dialog.showAndWait();
+            editedLinkeDfile.ifPresent(file -> {
+
+                Optional<FieldChange> fieldChange = entry.addFile(file);
+                fieldChange.ifPresent(change -> {
+                    UndoableFieldChange ce = new UndoableFieldChange(change);
+                    panel.getUndoManager().addEdit(ce);
+                    panel.markBaseChanged();
+                });
+            });
+        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index af21a220638..d63e6e6f964 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -61,7 +61,9 @@
  *
  * For use when downloading files, this class also offers a progress bar and a "Downloading..."
  * label that can be hidden when the download is complete.
+ * @deprecated Use {@link LinkedFileEditDialogView}
  */
+@Deprecated
 public class FileListEntryEditor {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
@@ -82,6 +84,9 @@ public class FileListEntryEditor {
     //Do not make this variable final, as then the lambda action listener will fail on compiöe
     private BibDatabaseContext databaseContext;
     private final ActionListener browsePressed = e -> {
+
+
+
         String fileText = link.getText().trim();
         Optional<Path> file = FileHelper.expandFilename(this.databaseContext, fileText,
                 Globals.prefs.getFileDirectoryPreferences());
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
new file mode 100644
index 00000000000..6cb65fcc83f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<DialogPane minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogView">
+   <content>
+      <GridPane>
+        <columnConstraints>
+          <ColumnConstraints hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="200.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="108.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>
+         <children>
+               <Label minWidth="95.0" text="%Link" />
+               <TextField fx:id="link" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+               <Label text="Description" GridPane.rowIndex="1" />
+               <TextField fx:id="description" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+            <ComboBox fx:id="fileType" minHeight="-Infinity" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" />
+            <Button id="browse" mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse" GridPane.columnIndex="2">
+               <GridPane.margin>
+                  <Insets left="10.0" />
+               </GridPane.margin>
+            </Button>
+            <Label text="Filetype" GridPane.rowIndex="2" />
+         </children>
+      </GridPane>
+   </content>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
new file mode 100644
index 00000000000..3833f493437
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -0,0 +1,71 @@
+package org.jabref.gui.filelist;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
+
+    @FXML private TextField link;
+    @FXML private TextField description;
+    @FXML private ComboBox<ExternalFileType> fileType;
+
+    @Inject private DialogService dialogService;
+    @Inject private StateManager stateManager;
+
+    @Inject private PreferencesService preferences;
+
+    private LinkedFilesEditDialogViewModel viewModel;
+
+    private final LinkedFile linkedFile;
+    private ExternalFileTypes externalFileTypes;
+
+    public LinkedFileEditDialogView(LinkedFile linkedFile) {
+        this.linkedFile = linkedFile;
+
+        this.externalFileTypes = ExternalFileTypes.getInstance();
+        ViewLoader.view(this)
+                  .load()
+                  .setAsContent(this.getDialogPane());
+
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
+
+        this.setResultConverter(button -> {
+            if (button == ButtonType.APPLY) {
+                return viewModel.getNewLinkedFile();
+            } else {
+                return null;
+            }
+        });
+    }
+
+    @FXML
+    private void initialize() {
+
+        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences, externalFileTypes);
+        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
+        link.textProperty().bindBidirectional(viewModel.linkProperty());
+        fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());
+    }
+
+    @FXML
+    private void openBrowseDialog(ActionEvent event) {
+        viewModel.openBrowseDialog();
+        link.requestFocus();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
new file mode 100644
index 00000000000..5a24ba38822
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -0,0 +1,126 @@
+package org.jabref.gui.filelist;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.externalfiletype.UnknownExternalFileType;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.util.FileHelper;
+import org.jabref.preferences.PreferencesService;
+
+public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
+
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
+    private final StringProperty link = new SimpleStringProperty("");
+    private final StringProperty description = new SimpleStringProperty("");
+    private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
+    private final BibDatabaseContext database;
+    private final DialogService dialogService;
+    private final PreferencesService preferences;
+    private final ExternalFileTypes externalFileTypes;
+
+    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService, PreferencesService preferences, ExternalFileTypes externalFileTypes) {
+        this.database = database;
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.externalFileTypes = externalFileTypes;
+        allExternalFileTypes.set(FXCollections.observableArrayList(externalFileTypes.getExternalFileTypeSelection()));
+        setValues(linkedFile);
+    }
+
+    private void setExternalFileTypeByExtension(String link) {
+        if (!link.isEmpty()) {
+
+            // Check if this looks like a remote link:
+            if (REMOTE_LINK_PATTERN.matcher(link).matches()) {
+                externalFileTypes.getExternalFileTypeByExt("html").ifPresent(selectedExternalFileType::setValue);
+            }
+
+            // Try to guess the file type:
+            String theLink = link.trim();
+            externalFileTypes.getExternalFileTypeForName(theLink).ifPresent(selectedExternalFileType::setValue);
+        }
+    }
+
+    public void openBrowseDialog() {
+        String fileText = link.get();
+
+        Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());
+
+        Path workingDir = file.orElse(preferences.getWorkingDir());
+        String fileName = Paths.get(fileText).getFileName().toString();
+
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                                                                                               .withInitialDirectory(workingDir)
+                                                                                               .withInitialFileName(fileName)
+                                                                                               .build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
+            // Store the directory for next time:
+            preferences.setWorkingDir(path);
+
+            // If the file is below the file directory, make the path relative:
+            List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
+            path = FileUtil.shortenFileName(path, fileDirectories);
+
+            link.set(path.toString());
+            setExternalFileTypeByExtension(link.getValueSafe());
+        });
+    }
+
+    public void setValues(LinkedFile linkedFile) {
+        description.set(linkedFile.getDescription());
+        link.set(linkedFile.getLink());
+
+        selectedExternalFileType.setValue(null);
+
+        // See what is a reasonable selection for the type combobox:
+        Optional<ExternalFileType> fileType = externalFileTypes.fromLinkedFile(linkedFile, false);
+        if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
+            selectedExternalFileType.setValue(fileType.get());
+        } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
+            setExternalFileTypeByExtension(linkedFile.getLink());
+        }
+    }
+
+    public StringProperty linkProperty() {
+        return link;
+    }
+
+    public StringProperty descriptionProperty() {
+        return description;
+    }
+
+    public ListProperty<ExternalFileType> externalFileTypeProperty() {
+        return allExternalFileTypes;
+    }
+
+    public ObjectProperty<ExternalFileType> selectedExternalFileTypeProperty() {
+        return selectedExternalFileType;
+    }
+
+    public LinkedFile getNewLinkedFile() {
+        return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue().toString());
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index 94f20f2adc9..61f82fabdc3 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -21,12 +21,13 @@
 public class AboutDialogView extends BaseDialog<Void> {
 
     @FXML private ButtonType copyVersionButton;
-    @FXML protected ImageView iconImage;
+    @FXML private TextArea textAreaVersions;
+    @FXML private ImageView iconImage;
+
     @Inject private DialogService dialogService;
     @Inject private ClipBoardManager clipBoardManager;
     @Inject private BuildInfo buildInfo;
 
-    @FXML private TextArea textAreaVersions;
     private AboutDialogViewModel viewModel;
 
     public AboutDialogView() {
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index 21bc70860b6..21f3bd6167a 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -67,8 +67,8 @@
 import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.FileListEntry;
-import org.jabref.gui.filelist.FileListEntryEditor;
 import org.jabref.gui.filelist.FileListTableModel;
+import org.jabref.gui.filelist.LinkedFileEditDialogView;
 import org.jabref.gui.groups.GroupTreeNodeViewModel;
 import org.jabref.gui.groups.UndoableChangeEntriesOfGroup;
 import org.jabref.gui.help.HelpAction;
@@ -176,7 +176,7 @@ public class ImportInspectionDialog extends JabRefDialog implements ImportInspec
     private final PreviewPanel preview;
     private final Map<BibEntry, Set<GroupTreeNode>> groupAdditions = new HashMap<>();
     private final JCheckBox autoGenerate = new JCheckBox(Localization.lang("Generate keys"),
-            Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION));
+                                                         Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION));
     private final JLabel duplLabel = new JLabel(IconTheme.JabRefIcons.DUPLICATE.getSmallIcon());
     private final JLabel fileLabel = new JLabel(IconTheme.JabRefIcons.FILE.getSmallIcon());
     private final JLabel urlLabel = new JLabel(IconTheme.JabRefIcons.WWW.getSmallIcon());
@@ -206,7 +206,7 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
 
         sortedList = new SortedList<>(entries);
         DefaultEventTableModel<BibEntry> tableModelGl = (DefaultEventTableModel<BibEntry>) GlazedListsSwing
-                .eventTableModelWithThreadProxyList(sortedList, new EntryTableFormat());
+                                                                                                           .eventTableModelWithThreadProxyList(sortedList, new EntryTableFormat());
         glTable = new EntryTable(tableModelGl);
         GeneralRenderer renderer = new GeneralRenderer(Color.white);
         glTable.setDefaultRenderer(JLabel.class, renderer);
@@ -216,11 +216,11 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
         glTable.getActionMap().put("delete", deleteListener);
 
         selectionModel = (DefaultEventSelectionModel<BibEntry>) GlazedListsSwing
-                .eventSelectionModelWithThreadProxyList(sortedList);
+                                                                                .eventSelectionModelWithThreadProxyList(sortedList);
         glTable.setSelectionModel(selectionModel);
         selectionModel.getSelected().addListEventListener(new EntrySelectionListener());
         comparatorChooser = TableComparatorChooser.install(glTable, sortedList,
-                AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
+                                                           AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
         setupComparatorChooser();
         glTable.addMouseListener(new TableClickListener());
 
@@ -316,7 +316,7 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
 
         // Remember and default to last size:
         setSize(new Dimension(Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_WIDTH),
-                Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_HEIGHT)));
+                              Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_HEIGHT)));
         addWindowListener(new WindowAdapter() {
 
             @Override
@@ -380,8 +380,8 @@ public void addEntries(Collection<BibEntry> entriesToAdd) {
             // database (if
             // applicable) and against entries already in the table.
             if ((panel != null) && (DuplicateCheck
-                    .containsDuplicate(panel.getDatabase(), entry, panel.getBibDatabaseContext().getMode()).isPresent()
-                    || (internalDuplicate(this.entries, entry).isPresent()))) {
+                                                  .containsDuplicate(panel.getDatabase(), entry, panel.getBibDatabaseContext().getMode()).isPresent()
+                                    || (internalDuplicate(this.entries, entry).isPresent()))) {
                 entry.setGroupHit(true);
                 SwingUtilities.invokeLater(() -> deselectAllDuplicates.setEnabled(true));
             }
@@ -457,7 +457,7 @@ private void generateKeyForEntry(BibEntry entry) {
 
             // Generate a unique key:
             new BibtexKeyGenerator(localMetaData.getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
-                    database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
+                                   database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
             // Remove the entry from the database again, since we only added it in
             // order to
             // make sure the key was unique:
@@ -499,7 +499,7 @@ private void generateKeys() {
                 database.insertEntry(entry);
 
                 new BibtexKeyGenerator(localMetaData.getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
-                        database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
+                                       database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
                 // Add the generated key to our list:   -- TODO: Why??
                 keys.add(entry.getCiteKeyOptional());
             }
@@ -649,9 +649,9 @@ public void showMessage(String message) {
      */
     public void showErrorMessage(String fetcherTitle, String localizedException) {
         showMessage(Localization.lang("Error while fetching from %0", fetcherTitle) + "\n" +
-                Localization.lang("Please try again later and/or check your network connection.") + "\n" +
-                localizedException,
-                Localization.lang("Search %0", fetcherTitle), JOptionPane.ERROR_MESSAGE);
+                    Localization.lang("Please try again later and/or check your network connection.") + "\n" +
+                    localizedException,
+                    Localization.lang("Search %0", fetcherTitle), JOptionPane.ERROR_MESSAGE);
     }
 
     public JabRefFrame getFrame() {
@@ -731,11 +731,11 @@ public void actionPerformed(ActionEvent event) {
                     if (entry.isGroupHit()) {
 
                         boolean continuePressed = frame.getDialogService().showConfirmationDialogWithOptOutAndWait(Localization.lang("Duplicates found"),
-                                Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
-                                Localization.lang("Continue"),
-                                Localization.lang("Cancel"),
-                                Localization.lang("Disable this confirmation dialog"),
-                                optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut));
+                                                                                                                   Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
+                                                                                                                   Localization.lang("Continue"),
+                                                                                                                   Localization.lang("Cancel"),
+                                                                                                                   Localization.lang("Disable this confirmation dialog"),
+                                                                                                                   optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut));
 
                         if (!continuePressed) {
                             return;
@@ -834,9 +834,9 @@ private boolean addToGroups(NamedCompound ce, BibEntry entry, Set<GroupTreeNode>
                 // immediately.
 
                 boolean generateKeysPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Add to group"),
-                        Localization.lang("Cannot add entries to group without generating keys. Generate keys now?"),
-                        Localization.lang("Generate keys"),
-                        Localization.lang("Cancel"));
+                                                                                                     Localization.lang("Cannot add entries to group without generating keys. Generate keys now?"),
+                                                                                                     Localization.lang("Generate keys"),
+                                                                                                     Localization.lang("Cancel"));
 
                 if (generateKeysPressed) {
                     generateKeys();
@@ -854,7 +854,7 @@ private boolean addToGroups(NamedCompound ce, BibEntry entry, Set<GroupTreeNode>
                         List<FieldChange> undo = entryChanger.add(Collections.singletonList(entry));
                         if (!undo.isEmpty()) {
                             ce.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(new GroupTreeNodeViewModel(node),
-                                    undo));
+                                                                                    undo));
                         }
                     }
                 }
@@ -970,8 +970,8 @@ public void mouseClicked(MouseEvent e) {
                             return;
                         }
                         FileListEntry fl = tableModel.getEntry(0);
-                        (new ExternalFileMenuItem(frame, entry, "", fl.getLink(), null, panel.getBibDatabaseContext(),
-                                fl.getType())).actionPerformed(null);
+                        (new ExternalFileMenuItem(frame, "", fl.getLink(), null, panel.getBibDatabaseContext(),
+                                                  fl.getType())).actionPerformed(null);
                     }
                 } else { // Must be URL_COL
                     openExternalLink(FieldName.URL, e);
@@ -1028,8 +1028,8 @@ private void showFileFieldMenu(MouseEvent e) {
                 if ((description == null) || (description.trim().isEmpty())) {
                     description = flEntry.getLink();
                 }
-                menu.add(new ExternalFileMenuItem(panel.frame(), entry, description, flEntry.getLink(),
-                        flEntry.getType().get().getIcon().getSmallIcon(), panel.getBibDatabaseContext(), flEntry.getType()));
+                menu.add(new ExternalFileMenuItem(panel.frame(), description, flEntry.getLink(),
+                                                  flEntry.getType().get().getIcon().getSmallIcon(), panel.getBibDatabaseContext(), flEntry.getType()));
                 count++;
             }
             if (count == 0) {
@@ -1083,12 +1083,12 @@ public void mousePressed(MouseEvent e) {
             if ((col == DUPL_COL) && (glTable.getValueAt(row, col) != null)) {
                 BibEntry first = sortedList.get(row);
                 Optional<BibEntry> other = DuplicateCheck.containsDuplicate(panel.getDatabase(), first,
-                        panel.getBibDatabaseContext().getMode());
+                                                                            panel.getBibDatabaseContext().getMode());
                 if (other.isPresent()) {
                     // This will be true if the duplicate is in the existing
                     // database.
                     DuplicateResolverDialog diag = new DuplicateResolverDialog(ImportInspectionDialog.this, other.get(),
-                            first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION);
+                                                                               first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION);
                     diag.setLocationRelativeTo(ImportInspectionDialog.this);
                     diag.setVisible(true);
                     ImportInspectionDialog.this.toFront();
@@ -1149,7 +1149,7 @@ public void mousePressed(MouseEvent e) {
                 other = internalDuplicate(entries, first);
                 if (other.isPresent()) {
                     DuplicateResolverDialog diag = new DuplicateResolverDialog(ImportInspectionDialog.this, first,
-                            other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH);
+                                                                               other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH);
                     diag.setLocationRelativeTo(ImportInspectionDialog.this);
                     diag.setVisible(true);
                     ImportInspectionDialog.this.toFront();
@@ -1223,9 +1223,9 @@ public void actionPerformed(ActionEvent actionEvent) {
             if (!entry.getCiteKeyOptional().isPresent()) {
 
                 boolean generateKeyPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Download file"),
-                        Localization.lang("This entry has no BibTeX key. Generate key now?"),
-                        Localization.lang("Generate key"),
-                        Localization.lang("Cancel"));
+                                                                                                    Localization.lang("This entry has no BibTeX key. Generate key now?"),
+                                                                                                    Localization.lang("Generate key"),
+                                                                                                    Localization.lang("Cancel"));
 
                 if (generateKeyPressed) {
                     generateKeyForEntry(entry);
@@ -1268,9 +1268,9 @@ public void actionPerformed(ActionEvent actionEvent) {
             if (!entry.hasCiteKey()) {
 
                 boolean generateKeyPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Download file"),
-                        Localization.lang("This entry has no BibTeX key. Generate key now?"),
-                        Localization.lang("Generate key"),
-                        Localization.lang("Cancel"));
+                                                                                                    Localization.lang("This entry has no BibTeX key. Generate key now?"),
+                                                                                                    Localization.lang("Generate key"),
+                                                                                                    Localization.lang("Cancel"));
 
                 if (generateKeyPressed) {
                     generateKeyForEntry(entry);
@@ -1284,18 +1284,18 @@ public void actionPerformed(ActionEvent actionEvent) {
             // links:
             JDialog diag = new JDialog(ImportInspectionDialog.this, true);
             JabRefExecutorService.INSTANCE
-                    .execute(AutoSetLinks.autoSetLinks(entry, bibDatabaseContext, e -> {
-                        if (e.getID() > 0) {
-
-                            entries.getReadWriteLock().writeLock().lock();
-                            try {
-                                entry.setField(FieldName.FILE, localModel.getStringRepresentation());
-                            } finally {
-                                entries.getReadWriteLock().writeLock().unlock();
-                            }
-                            glTable.repaint();
-                        }
-                    }, diag));
+                                          .execute(AutoSetLinks.autoSetLinks(entry, bibDatabaseContext, e -> {
+                                              if (e.getID() > 0) {
+
+                                                  entries.getReadWriteLock().writeLock().lock();
+                                                  try {
+                                                      entry.setField(FieldName.FILE, localModel.getStringRepresentation());
+                                                  } finally {
+                                                      entries.getReadWriteLock().writeLock().unlock();
+                                                  }
+                                                  glTable.repaint();
+                                              }
+                                          }, diag));
 
         }
     }
@@ -1315,18 +1315,12 @@ public void actionPerformed(ActionEvent actionEvent) {
                 return;
             }
             entry = selectionModel.getSelected().get(0);
-            LinkedFile flEntry = new LinkedFile("", "", "");
-            FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true, bibDatabaseContext, true);
-            editor.setVisible(true, true);
-            if (editor.okPressed()) {
-                entries.getReadWriteLock().writeLock().lock();
-                try {
-                    entry.addFile(flEntry);
-                } finally {
-                    entries.getReadWriteLock().writeLock().unlock();
-                }
-                glTable.repaint();
-            }
+            LinkedFile linkedFile = new LinkedFile("", "", "");
+
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
+
+            Optional<LinkedFile> editedLinkedFile = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
+            editedLinkedFile.ifPresent(file -> entry.addFile(linkedFile));
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 58074f9ce12..556d95f4b52 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -62,7 +62,7 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
                         panel.showAndEdit(entry.getEntry());
                     }
                 })
-                .withContextMenu(entry -> RightClickMenu.create(entry, keyBindingRepository, panel, Globals.getKeyPrefs()))
+        .withContextMenu(entry -> RightClickMenu.create(entry, keyBindingRepository, panel, Globals.getKeyPrefs(), frame.getDialogService()))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnMouseDragEntered(this::handleOnDragEntered)
                 .install(this);
@@ -219,6 +219,7 @@ private void handleOnDragEntered(TableRow<BibEntryTableViewModel> row, BibEntryT
         // Support the following gesture to select entries: click on one row -> hold mouse button -> move over other rows
         // We need to select all items between the starting row and the row where the user currently hovers the mouse over
         // It is not enough to just select the currently hovered row since then sometimes rows are not marked selected if the user moves to fast
+        @SuppressWarnings("unchecked")
         TableRow<BibEntryTableViewModel> sourceRow = (TableRow<BibEntryTableViewModel>) event.getGestureSource();
         getSelectionModel().selectRange(sourceRow.getIndex(), row.getIndex());
     }
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index a8c5520728d..01acda95c64 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -10,10 +10,12 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.actions.OldCommandWrapper;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.filelist.AttachFileAction;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
 import org.jabref.gui.mergeentries.FetchAndMergeEntry;
@@ -30,7 +32,7 @@
 
 public class RightClickMenu {
 
-    public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingRepository keyBindingRepository, BasePanel panel, KeyBindingRepository keyBindings) {
+    public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingRepository keyBindingRepository, BasePanel panel, KeyBindingRepository keyBindings, DialogService dialogService) {
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory(keyBindingRepository);
 
@@ -84,7 +86,7 @@ public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingReposit
 
         contextMenu.getItems().add(new ChangeEntryTypeMenu(keyBindings).getChangeEntryTypeMenu(entry.getEntry(), panel.getBibDatabaseContext(), panel.getUndoManager()));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.MERGE_WITH_FETCHED_ENTRY, getFetchEntryData(panel)));
-        contextMenu.getItems().add(factory.createMenuItem(StandardActions.ADD_FILE_LINK, getAddFileLinkCommand(panel)));
+        contextMenu.getItems().add(factory.createMenuItem(StandardActions.ATTACH_FILE, new AttachFileAction(panel, dialogService)));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.MERGE_ENTRIES, mergeEntries(panel)));
 
         contextMenu.getItems().add(new SeparatorMenuItem());
@@ -120,12 +122,6 @@ private static OldCommandWrapper mergeEntries(BasePanel panel) {
         return command;
     }
 
-    private static OldCommandWrapper getAddFileLinkCommand(BasePanel panel) {
-        OldCommandWrapper command = new OldCommandWrapper(Actions.ADD_FILE_LINK, panel);
-        command.setExecutable(panel.getMainTable().getSelectedEntries().size() == 1);
-        return command;
-    }
-
     private static OldCommandWrapper getFetchEntryData(BasePanel panel) {
         OldCommandWrapper command = new OldCommandWrapper(Actions.MERGE_WITH_FETCHED_ENTRY, panel);
         command.setExecutable(isAnyFieldSetForSelectedEntry(FetchAndMergeEntry.SUPPORTED_FIELDS, panel));
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index acb769c1655..a6e8479e67f 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -41,7 +41,6 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -53,7 +52,6 @@
 import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.TestEntry;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -146,9 +144,10 @@ private void init() {
 
         FormBuilder builder = FormBuilder.create();
         builder.layout(new FormLayout("fill:pref:grow, 4dlu, left:pref, 4dlu, left:pref",
-                "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
-        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1, 1,
-                5);
+                                      "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
+        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1,
+                                                                                                                1,
+                                                                                                                5);
         builder.add(new JScrollPane(table)).xyw(1, 3, 5);
         builder.add(addButton).xy(3, 5);
         builder.add(removeButton).xy(5, 5);
@@ -164,7 +163,7 @@ private void init() {
             public void actionPerformed(ActionEvent event) {
                 if ((table.getRowCount() == 0) || (table.getSelectedRowCount() == 0)) {
                     frame.getDialogService().showErrorDialogAndWait(Localization.lang("Style selection"),
-                            Localization.lang("You must select a valid style file."));
+                                                                    Localization.lang("You must select a valid style file."));
                     return;
                 }
                 okPressed = true;
@@ -201,7 +200,7 @@ public void actionPerformed(ActionEvent event) {
         diag.pack();
 
         WindowLocation pw = new WindowLocation(diag, JabRefPreferences.STYLES_POS_X, JabRefPreferences.STYLES_POS_Y,
-                JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
+                                               JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
         pw.displayWindowAtStoredLocation();
     }
 
@@ -210,7 +209,7 @@ private void setupTable() {
         EventList<OOBibStyle> sortedStyles = new SortedList<>(styles);
 
         tableModel = (DefaultEventTableModel<OOBibStyle>) GlazedListsSwing
-                .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
+                                                                          .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
         table = new JTable(tableModel);
         TableColumnModel cm = table.getColumnModel();
         cm.getColumn(0).setPreferredWidth(100);
@@ -218,7 +217,7 @@ private void setupTable() {
         cm.getColumn(2).setPreferredWidth(80);
 
         selectionModel = (DefaultEventSelectionModel<OOBibStyle>) GlazedListsSwing
-                .eventSelectionModelWithThreadProxyList(sortedStyles);
+                                                                                  .eventSelectionModelWithThreadProxyList(sortedStyles);
         table.setSelectionModel(selectionModel);
         table.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.addMouseListener(new MouseAdapter() {
@@ -252,12 +251,9 @@ private void setupPopupMenu() {
             Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("jstyle");
             String link = style.getPath();
             try {
-                if (type.isPresent()) {
-                    JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), link, type);
-                } else {
-                    JabRefDesktop.openExternalFileUnknown(frame, new BibEntry(), new BibDatabaseContext(), link,
-                            new UnknownExternalFileType("jstyle"));
-                }
+
+                JabRefDesktop.openExternalFileAnyFormat(frame.getCurrentBasePanel().getDatabaseContext(), link, type);
+
             } catch (IOException e) {
                 LOGGER.warn("Problem open style file editor", e);
             }
@@ -270,9 +266,9 @@ private void setupPopupMenu() {
         removeAction = actionEvent -> getSelectedStyle().ifPresent(style -> {
 
             if (!style.isFromResource() && frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Remove style"),
-                    Localization.lang("Are you sure you want to remove the style?"),
-                    Localization.lang("Remove style"),
-                    Localization.lang("Cancel"))) {
+                                                                                                  Localization.lang("Are you sure you want to remove the style?"),
+                                                                                                  Localization.lang("Remove style"),
+                                                                                                  Localization.lang("Cancel"))) {
                 if (!loader.removeStyle(style)) {
                     LOGGER.info("Problem removing style");
                 }
@@ -470,14 +466,14 @@ public AddFileDialog() {
 
             JButton browse = new JButton(Localization.lang("Browse"));
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(FileType.JSTYLE)
-                    .withDefaultExtension(FileType.JSTYLE)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
+                                                                                                   .addExtensionFilter(FileType.JSTYLE)
+                                                                                                   .withDefaultExtension(FileType.JSTYLE)
+                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                                   .build();
 
             browse.addActionListener(e -> {
                 Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
+                                                         .runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
index 93cc9196605..7e6a43ecc26 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
@@ -256,8 +256,6 @@ public void setValues() {
         }
     }
 
-
-
     class ExportAction extends AbstractAction {
 
         public ExportAction() {
@@ -272,8 +270,7 @@ public void actionPerformed(ActionEvent e) {
                     .withDefaultExtension(FileType.XML)
                     .withInitialDirectory(prefs.get(JabRefPreferences.WORKING_DIRECTORY))
                     .build();
-            Optional<Path> path = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> dialogService.showFileSaveDialog(fileDialogConfiguration));
+            Optional<Path> path = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showFileSaveDialog(fileDialogConfiguration));
 
             path.ifPresent(exportFile -> {
                 try {
diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
index a8f8b0320b9..321d910ddfe 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
@@ -35,13 +35,11 @@
 import javax.swing.table.TableColumnModel;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -52,7 +50,6 @@
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.util.FileType;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
@@ -235,12 +232,8 @@ private void setupPopupMenu() {
                     // Fall back to ".txt"
                     Optional<ExternalFileType> txtType = ExternalFileTypes.getInstance()
                             .getExternalFileTypeByExt("txt");
-                    if (txtType.isPresent()) {
-                        JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), fileName, txtType);
-                    } else {
-                        JabRefDesktop.openExternalFileUnknown(frame, new BibEntry(), new BibDatabaseContext(), fileName,
-                                new UnknownExternalFileType("terms"));
-                    }
+                    JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), fileName, type);
+
                 }
             } catch (IOException e) {
                 LOGGER.warn("Problem open protected terms file editor", e);
@@ -433,11 +426,9 @@ public AddFileDialog() {
                     .addExtensionFilter(FileType.TERMS)
                     .withDefaultExtension(FileType.TERMS)
                     .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-            DialogService ds = frame.getDialogService();
 
             browse.addActionListener(e -> {
-                Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> ds.showFileOpenDialog(fileDialogConfiguration));
+                Optional<Path> file = DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 
diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
index 61e8788ee3c..59e9a8ccb6a 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
@@ -109,8 +109,8 @@ public class SearchResultFrame {
     private JTable entryTable;
     private PreviewPanel preview;
 
-    private SearchQuery searchQuery;
-    private boolean globalSearch;
+    private final SearchQuery searchQuery;
+    private final boolean globalSearch;
 
 
     public SearchResultFrame(JabRefFrame frame, String title, SearchQuery searchQuery, boolean globalSearch) {
@@ -293,7 +293,7 @@ public void selectLastEntry() {
     }
 
     public void selectPreviousEntry() {
-        selectEntry((entryTable.getSelectedRow() - 1 + entryTable.getRowCount()) % entryTable.getRowCount());
+        selectEntry(((entryTable.getSelectedRow() - 1) + entryTable.getRowCount()) % entryTable.getRowCount());
     }
 
     public void selectNextEntry() {
@@ -301,7 +301,7 @@ public void selectNextEntry() {
     }
 
     public void selectEntry(int index) {
-        if (index >= 0 && index < entryTable.getRowCount()) {
+        if ((index >= 0) && (index < entryTable.getRowCount())) {
             entryTable.changeSelection(index, 0, false, false);
         } else {
             contentPane.setDividerLocation(1.0f);
@@ -351,7 +351,7 @@ private void setupComparatorChooser(TableComparatorChooser<BibEntry> comparatorC
      */
     private void setWidths() {
         TableColumnModel cm = entryTable.getColumnModel();
-        for (int i = 0; i < PAD + FIELDS.length; i++) {
+        for (int i = 0; i < (PAD + FIELDS.length); i++) {
             switch (i) {
                 case FILE_COL:
                 case URL_COL:
@@ -393,7 +393,7 @@ private void addEntry(BibEntry entry, BasePanel panel) {
         entries.add(entry);
         entryHome.put(entry, panel);
 
-        if (preview.getEntry() == null || !preview.getBasePanel().isPresent()) {
+        if ((preview.getEntry() == null) || !preview.getBasePanel().isPresent()) {
             preview.setEntry(entry);
             preview.setBasePanel(panel);
             preview.setDatabaseContext(panel.getBibDatabaseContext());
@@ -475,7 +475,7 @@ public void mouseClicked(MouseEvent e) {
                             return;
                         }
                         FileListEntry fl = tableModel.getEntry(0);
-                        (new ExternalFileMenuItem(frame, entry, "", fl.getLink(), null,
+                            (new ExternalFileMenuItem(frame, "", fl.getLink(), null,
                                 p.getBibDatabaseContext(), fl.getType())).actionPerformed(null);
                     }
                     break;
@@ -518,7 +518,7 @@ public void processPopupTrigger(MouseEvent e) {
                     if ((description == null) || (description.trim().isEmpty())) {
                         description = flEntry.getLink();
                     }
-                    menu.add(new ExternalFileMenuItem(p.frame(), entry, description, flEntry.getLink(),
+                    menu.add(new ExternalFileMenuItem(p.frame(), description, flEntry.getLink(),
                             flEntry.getType().get().getIcon().getSmallIcon(), p.getBibDatabaseContext(), flEntry.getType()));
                     count++;
                 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index f4fda131aee..0a7246e7436 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -14,6 +14,8 @@
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1373,6 +1375,7 @@ public void storeFileHistory(FileHistory history) {
         }
     }
 
+    @Override
     public FileDirectoryPreferences getFileDirectoryPreferences() {
         List<String> fields = Arrays.asList(FieldName.FILE, FieldName.PDF, FieldName.PS);
         Map<String, String> fieldDirectories = new HashMap<>();
@@ -1742,4 +1745,15 @@ public MainTablePreferences getMainTablePreferences() {
                 getColumnPreferences(),
                 getBoolean(AUTO_RESIZE_MODE));
     }
+
+    @Override
+    public Path getWorkingDir() {
+        return Paths.get(get(WORKING_DIRECTORY));
+    }
+
+    @Override
+    public void setWorkingDir(Path dir) {
+        put(WORKING_DIRECTORY, dir.toString());
+
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 6ea1a9d56dc..1245e404ba7 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -1,7 +1,10 @@
 package org.jabref.preferences;
 
+import java.nio.file.Path;
+
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.model.metadata.FileDirectoryPreferences;
 
 public interface PreferencesService {
     JournalAbbreviationPreferences getJournalAbbreviationPreferences();
@@ -11,4 +14,11 @@ public interface PreferencesService {
     KeyBindingRepository getKeyBindingRepository();
 
     void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences);
+
+    FileDirectoryPreferences getFileDirectoryPreferences();
+
+    Path getWorkingDir();
+
+    void setWorkingDir(Path dir);
+
 }