diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index ef5e2875994..8c99cc4a68a 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -43,7 +43,6 @@
 import org.jabref.gui.bibtexkeypattern.SearchFixDuplicateLabels;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.collab.FileUpdatePanel;
-import org.jabref.gui.contentselector.ContentSelectorDialog;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.edit.ReplaceStringAction;
 import org.jabref.gui.entryeditor.EntryEditor;
@@ -399,11 +398,6 @@ private void setupActions() {
         actions.put(Actions.NEXT_PREVIEW_STYLE, this::nextPreviewStyle);
         actions.put(Actions.PREVIOUS_PREVIEW_STYLE, this::previousPreviewStyle);
 
-        actions.put(Actions.MANAGE_SELECTORS, () -> {
-            ContentSelectorDialog csd = new ContentSelectorDialog(frame, BasePanel.this, false, null);
-            csd.setVisible(true);
-        });
-
         actions.put(Actions.SEND_AS_EMAIL, new SendAsEMailAction(frame));
 
         actions.put(Actions.WRITE_XMP, new WriteXMPAction(this)::execute);
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index b657ee1e1db..dbbce3f23b3 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -64,6 +64,7 @@
 import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
+import org.jabref.gui.actions.ManageContentSelectorAction;
 import org.jabref.gui.actions.ManageCustomExportsAction;
 import org.jabref.gui.actions.ManageCustomImportsAction;
 import org.jabref.gui.actions.ManageJournalsAction;
@@ -941,7 +942,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new ManageContentSelectorAction(this)),
                 factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
                 factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));
 
diff --git a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
new file mode 100644
index 00000000000..31e2b1e1149
--- /dev/null
+++ b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
@@ -0,0 +1,29 @@
+package org.jabref.gui.actions;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.contentselector.ContentSelectorDialogView;
+import org.jabref.logic.l10n.Localization;
+
+public class ManageContentSelectorAction extends SimpleCommand {
+
+    private final JabRefFrame jabRefFrame;
+
+    public ManageContentSelectorAction(JabRefFrame jabRefFrame) {
+        this.jabRefFrame = jabRefFrame;
+    }
+
+    @Override
+    public void execute() {
+        BasePanel basePanel = jabRefFrame.getCurrentBasePanel();
+        if (noActiveConnectionExists(basePanel)) {
+            jabRefFrame.getDialogService().showErrorDialogAndWait(Localization.lang("Active database connection do not exists!"));
+            return;
+        }
+        new ContentSelectorDialogView(basePanel).showAndWait();
+    }
+
+    private boolean noActiveConnectionExists(BasePanel basePanel) {
+        return basePanel == null || basePanel.getBibDatabaseContext() == null;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
new file mode 100644
index 00000000000..94744038b42
--- /dev/null
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane minHeight="450.0" minWidth="375.0" prefHeight="450.0" prefWidth="407.0" xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.contentselector.ContentSelectorDialogView">
+    <content>
+        <VBox>
+         <children>
+            <Label prefHeight="27.0" prefWidth="108.0" text="Field names" />
+            <HBox prefHeight="140.0" prefWidth="385.0">
+               <children>
+                  <ListView fx:id="fieldNamesListView" prefHeight="140.0" prefWidth="297.0"/>
+                  <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
+                     <children>
+                        <Button fx:id="addFieldNameButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="%Add" onAction="#addNewFieldName">
+                           <VBox.margin>
+                              <Insets top="5.0" />
+                           </VBox.margin>
+                        </Button>
+                        <Button fx:id="removeFieldNameButton" mnemonicParsing="false" text="%Remove" onAction="#removeFieldName">
+                           <VBox.margin>
+                              <Insets top="5.0" />
+                           </VBox.margin>
+                        </Button>
+                     </children>
+                  </VBox>
+               </children>
+            </HBox>
+            <Separator prefWidth="200.0">
+               <VBox.margin>
+                  <Insets top="20.0" />
+               </VBox.margin>
+            </Separator>
+             <Label prefHeight="27.0" prefWidth="108.0" text="Keywords" />
+             <HBox prefHeight="140.0" prefWidth="385.0">
+                 <children>
+                     <ListView fx:id="keywordsListView" prefHeight="140.0" prefWidth="297.0" />
+                     <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
+                         <children>
+                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="%Add" onAction="#addNewKeyword">
+                                 <VBox.margin>
+                                     <Insets top="5.0" />
+                                 </VBox.margin>
+                             </Button>
+                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="%Remove" onAction="#removeKeyword">
+                                 <VBox.margin>
+                                     <Insets top="5.0" />
+                                 </VBox.margin>
+                             </Button>
+                         </children>
+                     </VBox>
+                 </children>
+             </HBox>
+         </children>
+        </VBox>
+    </content>
+    <ButtonType fx:id="saveButton" buttonData="OK_DONE" text="%Save" />
+    <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
deleted file mode 100644
index a188c1fca8a..00000000000
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
+++ /dev/null
@@ -1,499 +0,0 @@
-package org.jabref.gui.contentselector;
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinder;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.ContentSelector;
-import org.jabref.model.metadata.ContentSelectors;
-import org.jabref.model.metadata.MetaData;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ContentSelectorDialog extends JabRefDialog {
-
-    private static final String WORD_FIRSTLINE_TEXT = Localization.lang("<select word>");
-    private static final String FIELD_FIRST_LINE = Localization.lang("<field name>");
-    private static final Logger LOGGER = LoggerFactory.getLogger(ContentSelectorDialog.class);
-    private final GridBagLayout gbl = new GridBagLayout();
-    private final GridBagConstraints con = new GridBagConstraints();
-    private final JPanel fieldPan = new JPanel();
-    private final JPanel wordPan = new JPanel();
-    private final JPanel buttonPan = new JPanel();
-
-    private final JPanel fieldNamePan = new JPanel();
-    private final JPanel wordEditPan = new JPanel();
-    private final MetaData metaData;
-    private final JabRefFrame frame;
-    private final BasePanel panel;
-    private final JButton newField = new JButton(Localization.lang("New"));
-    private final JButton removeField = new JButton(Localization.lang("Remove"));
-    private final JButton newWord = new JButton(Localization.lang("New"));
-    private final JButton removeWord = new JButton(Localization.lang("Remove"));
-    private final JButton ok = new JButton(Localization.lang("OK"));
-    private final JButton cancel = new JButton();
-    private final JButton apply = new JButton(Localization.lang("Apply"));
-    private final DefaultListModel<String> fieldListModel = new DefaultListModel<>();
-    private final JList<String> fieldList = new JList<>(fieldListModel);
-    private final JTextField fieldNameField = new JTextField("", 20);
-    private final JTextField wordEditField = new JTextField("", 20);
-    private final JScrollPane fPane = new JScrollPane(fieldList);
-    private final Map<String, DefaultListModel<String>> wordListModels = new HashMap<>();
-    private final List<String> removedFields = new ArrayList<>();
-    private DefaultListModel<String> wordListModel = new DefaultListModel<>();
-    private JList<String> wordList = new JList<>(wordListModel);
-    private JScrollPane wPane = new JScrollPane(wordList);
-    private String currentField;
-
-
-    /**
-     *
-     * @param frame the JabRef Frame
-     * @param panel the currently selected BasePanel
-     * @param modal should this dialog be modal?
-     * @param fieldName the field this selector is initialized for. May be null.
-     */
-    public ContentSelectorDialog(JabRefFrame frame, BasePanel panel, boolean modal, String fieldName) {
-        super(Localization.lang("Manage content selectors"), ContentSelectorDialog.class);
-        this.setModal(modal);
-        this.metaData = panel.getBibDatabaseContext().getMetaData();
-        this.frame = frame;
-        this.panel = panel;
-        this.currentField = fieldName;
-
-        initLayout();
-
-        setupFieldSelector();
-        if (currentField != null) {
-            int fieldInd = fieldListModel.indexOf(currentField);
-            if (fieldInd >= 0) {
-                fieldList.setSelectedIndex(fieldInd);
-            }
-        } else {
-            if (!fieldListModel.isEmpty()) {
-                fieldList.setSelectedIndex(0);
-                currentField = fieldList.getSelectedValue();
-            }
-        }
-
-        setupWordSelector();
-        setupActions();
-        KeyBinder.bindCloseDialogKeyToCancelAction(this.rootPane, cancel.getAction());
-
-        pack();
-    }
-
-    private static int findPos(DefaultListModel<String> lm, String item) {
-        for (int i = 0; i < lm.size(); i++) {
-            String s = lm.get(i);
-            if (item.compareToIgnoreCase(s) < 0) { // item precedes s
-                return i;
-            }
-        }
-        return lm.size();
-    }
-
-    private void setupActions() {
-
-        wordList.addListSelectionListener(e -> {
-            wordEditField.setText(wordList.getSelectedValue());
-            wordEditField.selectAll();
-            wordEditField.requestFocus();
-        });
-
-        newWord.addActionListener(e -> newWordAction());
-
-        ActionListener wordEditFieldListener = e -> actOnWordEdit();
-        wordEditField.addActionListener(wordEditFieldListener);
-
-        removeWord.addActionListener(e -> {
-            int index = wordList.getSelectedIndex();
-            if (index == -1) {
-                return;
-            }
-            wordListModel.remove(index);
-            wordEditField.setText("");
-            if (!wordListModel.isEmpty()) {
-                wordList.setSelectedIndex(Math.min(index, wordListModel.size() - 1));
-            }
-        });
-
-        fieldList.addListSelectionListener(e -> {
-            currentField = fieldList.getSelectedValue();
-            fieldNameField.setText("");
-            setupWordSelector();
-        });
-
-        newField.addActionListener(e -> {
-            if (!fieldListModel.get(0).equals(FIELD_FIRST_LINE)) {
-                // only add <field name> once
-                fieldListModel.add(0, FIELD_FIRST_LINE);
-            }
-            fieldList.setSelectedIndex(0);
-            fPane.getVerticalScrollBar().setValue(0);
-            fieldNameField.setEnabled(true);
-            fieldNameField.setText(currentField);
-            fieldNameField.selectAll();
-            fieldNameField.requestFocus();
-        });
-
-        fieldNameField.addActionListener(e -> fieldNameField.transferFocus());
-
-        fieldNameField.addFocusListener(new FieldNameFocusAdapter());
-
-        removeField.addActionListener(e -> {
-            int index = fieldList.getSelectedIndex();
-            if (index == -1) {
-                return;
-            }
-            String fieldName = fieldListModel.get(index);
-            removedFields.add(fieldName);
-            fieldListModel.remove(index);
-            wordListModels.remove(fieldName);
-            fieldNameField.setText("");
-            if (!fieldListModel.isEmpty()) {
-                fieldList.setSelectedIndex(Math.min(index, wordListModel.size() - 1));
-            }
-        });
-
-        ok.addActionListener(e -> {
-            try {
-                applyChanges();
-                dispose();
-            } catch (Exception ex) {
-                LOGGER.info("Could not apply changes in \"Manage content selectors\"", ex);
-                JOptionPane.showMessageDialog(null, Localization.lang("Could not apply changes."));
-            }
-        });
-
-        apply.addActionListener(e -> {
-            // Store if an entry is currently being edited:
-            if (!"".equals(wordEditField.getText())) {
-                wordEditFieldListener.actionPerformed(null);
-            }
-            try {
-                applyChanges();
-            } catch (Exception ex) {
-                LOGGER.info("Could not apply changes in \"Manage content selectors\"", ex);
-                JOptionPane.showMessageDialog(null, Localization.lang("Could not apply changes."));
-            }
-        });
-
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        cancelAction.putValue(Action.NAME, Localization.lang("Cancel"));
-        cancel.setAction(cancelAction);
-    }
-
-    private void actOnWordEdit() {
-        String old = wordList.getSelectedValue();
-        String newVal = wordEditField.getText();
-        if ("".equals(newVal) || newVal.equals(old)) {
-            return; // Empty string or no change.
-        }
-        int index = wordList.getSelectedIndex();
-        if (wordListModel.contains(newVal)) {
-            // ensure that word already in list is visible
-            index = wordListModel.indexOf(newVal);
-            wordList.ensureIndexIsVisible(index);
-            return;
-        }
-
-        int newIndex = findPos(wordListModel, newVal);
-        if (index >= 0) {
-            // initiate replacement of selected word
-            wordListModel.remove(index);
-            if (newIndex > index) {
-                // newIndex has to be adjusted after removal of previous entry
-                newIndex--;
-            }
-        }
-        wordListModel.add(newIndex, newVal);
-        wordList.ensureIndexIsVisible(newIndex);
-        wordEditField.selectAll();
-    }
-
-    private void newWordAction() {
-        if (wordListModel.isEmpty() || !wordListModel.get(0).equals(WORD_FIRSTLINE_TEXT)) {
-            wordListModel.add(0, WORD_FIRSTLINE_TEXT);
-        }
-        wordList.setSelectedIndex(0);
-        wPane.getVerticalScrollBar().setValue(0);
-    }
-
-    private void applyChanges() {
-        boolean anythingChanged = false; // Watch if we should mark as there is data changed
-
-        // First remove the mappings for fields that have been deleted.
-        // If these were re-added, they will be added below, so it doesn't
-        // cause any harm to remove them here.
-        for (String fieldName : removedFields) {
-            metaData.clearContentSelectors(fieldName);
-            anythingChanged = true;
-        }
-
-        // Cycle through all fields that we have created listmodels for:
-        for (Map.Entry<String, DefaultListModel<String>> entry : wordListModels.entrySet()) {
-            // For each field name, store the values:
-            if ((entry.getKey() == null) || FIELD_FIRST_LINE.equals(entry.getKey())) {
-                continue;
-            }
-            DefaultListModel<String> lm = entry.getValue();
-            int start = 0;
-            // Avoid storing the <new word> marker if it is there:
-            if (!lm.isEmpty()) {
-                while ((start < lm.size()) && lm.get(start).equals(WORD_FIRSTLINE_TEXT)) {
-                    start++;
-                }
-            }
-
-            Set<String> data = new HashSet<>();
-            for (int wrd = start; wrd < lm.size(); wrd++) {
-                String word = lm.get(wrd);
-                data.add(word);
-            }
-
-            // Check if any words have been added
-            if (!data.equals(new HashSet<>(metaData.getContentSelectorValuesForField(entry.getKey())))) {
-                anythingChanged = true;
-            }
-
-            // Check if there are words to be added and previously there were no content selector for the field
-            if (!data.isEmpty() && metaData.getContentSelectorValuesForField(entry.getKey()).isEmpty()) {
-                anythingChanged = true;
-            }
-
-            metaData.addContentSelector(new ContentSelector(entry.getKey(), new ArrayList<>(data)));
-        }
-
-        if (anythingChanged) {
-            // Update all selectors in the current BasePanel.
-            panel.setupMainPanel();
-
-            // Mark the database updated so changes are not lost
-            panel.markNonUndoableBaseChanged();
-        }
-    }
-
-    /**
-     * Set the contents of the field selector list.
-     *
-     */
-    private void setupFieldSelector() {
-        fieldListModel.clear();
-        SortedSet<String> contents = new TreeSet<>();
-        ContentSelectors selectors = metaData.getContentSelectors();
-        for (String s : selectors.getFieldNamesWithSelectors()) {
-            contents.add(s);
-        }
-        if (contents.isEmpty()) {
-            // if nothing was added, put the default fields (as described in the help)
-            fieldListModel.addElement(FieldName.AUTHOR);
-            fieldListModel.addElement(FieldName.JOURNAL);
-            fieldListModel.addElement(FieldName.KEYWORDS);
-            fieldListModel.addElement(FieldName.PUBLISHER);
-        } else {
-            for (String s : contents) {
-                fieldListModel.addElement(s);
-            }
-        }
-
-        if (currentField == null) {
-            // if dialog is created for the whole database,
-            // select the first field to avoid confusions in GUI usage
-            fieldList.setSelectedIndex(0);
-        } else {
-            // a specific field has been chosen at the constructor
-            // select this field
-            int i = fieldListModel.indexOf(currentField);
-            if (i != -1) {
-                // field has been found in list, select it
-                fieldList.setSelectedIndex(i);
-            }
-        }
-    }
-
-    private void setupWordSelector() {
-
-        // Have we already created a listmodel for this field?
-        wordListModel = wordListModels.get(currentField);
-        if (wordListModel == null) {
-            wordListModel = new DefaultListModel<>();
-            wordList.setModel(wordListModel);
-            wordListModels.put(currentField, wordListModel);
-
-            int index = 0;
-            for (String s : metaData.getContentSelectorValuesForField(currentField)) {
-                wordListModel.add(index, s);
-                index++;
-            }
-        } else {
-            wordList.setModel(wordListModel);
-        }
-    }
-
-    private void initLayout() {
-        fieldNameField.setEnabled(false);
-        fieldList.setVisibleRowCount(4);
-        wordList.setVisibleRowCount(10);
-        final String VAL = "Uren luren himmelturen, ja Besseggen.";
-        fieldList.setPrototypeCellValue(VAL);
-        wordList.setPrototypeCellValue(VAL);
-
-        fieldPan.setBorder(
-                BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("Field name")));
-        wordPan.setBorder(
-                BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("Keyword")));
-        fieldPan.setLayout(gbl);
-        wordPan.setLayout(gbl);
-        con.insets = new Insets(2, 2, 2, 2);
-        con.fill = GridBagConstraints.BOTH;
-        con.gridwidth = 2;
-        con.weightx = 1;
-        con.weighty = 1;
-        con.gridx = 0;
-        con.gridy = 0;
-        gbl.setConstraints(fPane, con);
-        fieldPan.add(fPane);
-        gbl.setConstraints(wPane, con);
-        wordPan.add(wPane);
-        con.gridwidth = 1;
-        con.gridx = 2;
-        //con.weightx = 0.7;
-        con.gridheight = 2;
-        gbl.setConstraints(fieldNamePan, con);
-        fieldPan.add(fieldNamePan);
-        gbl.setConstraints(wordEditPan, con);
-        wordPan.add(wordEditPan);
-        con.gridx = 0;
-        con.gridy = 1;
-        con.weightx = 0;
-        con.weighty = 0;
-        con.gridwidth = 1;
-        con.gridheight = 1;
-        con.fill = GridBagConstraints.NONE;
-        con.anchor = GridBagConstraints.WEST;
-        gbl.setConstraints(newField, con);
-        fieldPan.add(newField);
-        gbl.setConstraints(newWord, con);
-        wordPan.add(newWord);
-        con.gridx = 1;
-        //con.anchor = GridBagConstraints.EAST;
-        gbl.setConstraints(removeField, con);
-        fieldPan.add(removeField);
-        gbl.setConstraints(removeWord, con);
-        wordPan.add(removeWord);
-        con.anchor = GridBagConstraints.WEST;
-        con.gridx = 0;
-        con.gridy = 0;
-        gbl.setConstraints(fieldNameField, con);
-        fieldNamePan.add(fieldNameField);
-        gbl.setConstraints(wordEditField, con);
-        wordEditPan.add(wordEditField);
-
-        // Add buttons:
-        ButtonBarBuilder bsb = new ButtonBarBuilder(buttonPan);
-        bsb.addGlue();
-        bsb.addButton(ok);
-        bsb.addButton(apply);
-        bsb.addButton(cancel);
-        bsb.addRelatedGap();
-        bsb.addButton(new HelpAction(HelpFile.CONTENT_SELECTOR).getHelpButton());
-        bsb.addGlue();
-
-        // Add panels to dialog:
-        con.fill = GridBagConstraints.BOTH;
-        getContentPane().setLayout(gbl);
-        con.weightx = 1;
-        con.weighty = 0.5;
-        con.gridwidth = 1;
-        con.gridheight = 1;
-        con.gridx = 0;
-        con.gridy = 0;
-        gbl.setConstraints(fieldPan, con);
-        getContentPane().add(fieldPan);
-        con.gridy = 1;
-        gbl.setConstraints(wordPan, con);
-        getContentPane().add(wordPan);
-        con.weighty = 0;
-        con.gridy = 2;
-        con.insets = new Insets(12, 2, 2, 2);
-        gbl.setConstraints(buttonPan, con);
-        getContentPane().add(buttonPan);
-
-    }
-
-    private class FieldNameFocusAdapter extends FocusAdapter {
-
-        /**
-         * Adds the text value to the list
-         */
-        @Override
-        public void focusLost(FocusEvent e) {
-            String s = fieldNameField.getText();
-            fieldNameField.setText("");
-            fieldNameField.setEnabled(false);
-            if (!FIELD_FIRST_LINE.equals(s) && !"".equals(s)) {
-                // user has typed something
-
-                // remove "<first name>" from list
-                fieldListModel.remove(0);
-
-                int pos;
-                if (fieldListModel.contains(s)) {
-                    // field already exists, scroll to that field (below)
-                    pos = fieldListModel.indexOf(s);
-                } else {
-                    // Add new field.
-                    pos = findPos(fieldListModel, s);
-                    fieldListModel.add(Math.max(0, pos), s);
-                }
-                fieldList.setSelectedIndex(pos);
-                fieldList.ensureIndexIsVisible(pos);
-                currentField = s;
-                setupWordSelector();
-                newWordAction();
-            }
-        }
-
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
new file mode 100644
index 00000000000..013cbcb79ad
--- /dev/null
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -0,0 +1,122 @@
+package org.jabref.gui.contentselector;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import javax.inject.Inject;
+
+import javafx.beans.property.ListProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionModel;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
+
+public class ContentSelectorDialogView extends BaseDialog<Void> {
+
+    @FXML
+    private Button addFieldNameButton;
+    @FXML
+    private Button removeFieldNameButton;
+    @FXML
+    private Button addKeywordButton;
+    @FXML
+    private Button removeKeywordButton;
+    @FXML
+    private ListView<String> fieldNamesListView;
+    @FXML
+    private ListView<String> keywordsListView;
+    @FXML
+    private ButtonType saveButton;
+
+    @Inject
+    private DialogService dialogService;
+    private final BasePanel basePanel;
+    private ContentSelectorDialogViewModel viewModel;
+
+    public ContentSelectorDialogView(BasePanel basePanel) {
+        this.setTitle(Localization.lang("Manage content selectors"));
+        this.getDialogPane().setPrefSize(375, 475);
+
+        this.basePanel = basePanel;
+
+        ViewLoader.view(this)
+                .load()
+                .setAsDialogPane(this);
+
+        ControlHelper.setAction(saveButton, getDialogPane(), event -> saveChangesAndClose());
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new ContentSelectorDialogViewModel(basePanel, dialogService);
+
+        initFieldNameComponents();
+        initKeywordsComponents();
+    }
+
+    private void initFieldNameComponents() {
+        initListView(fieldNamesListView, viewModel::getFieldNamesBackingList);
+        viewModel.selectedFieldNameProperty().bind(fieldNamesListView.getSelectionModel().selectedItemProperty());
+        removeFieldNameButton.disableProperty().bind(viewModel.isNoFieldNameSelected());
+        EasyBind.subscribe(viewModel.selectedFieldNameProperty(), viewModel::populateKeywords);
+    }
+
+    private void initKeywordsComponents() {
+        initListView(keywordsListView, viewModel::getKeywordsBackingList);
+        viewModel.selectedKeywordProperty().bind(keywordsListView.getSelectionModel().selectedItemProperty());
+        addKeywordButton.disableProperty().bind(viewModel.isFieldNameListEmpty());
+        removeKeywordButton.disableProperty().bind(viewModel.isNoKeywordSelected());
+    }
+
+    @FXML
+    private void addNewFieldName() {
+        viewModel.showInputFieldNameDialog();
+    }
+
+    @FXML
+    private void removeFieldName() {
+        getSelectedFieldName().ifPresent(viewModel::showRemoveFieldNameConfirmationDialog);
+    }
+
+    @FXML
+    private void addNewKeyword() {
+        getSelectedFieldName().ifPresent(viewModel::showInputKeywordDialog);
+    }
+
+    @FXML
+    private void removeKeyword() {
+        Optional<String> fieldName = getSelectedFieldName();
+        Optional<String> keywordToRemove = getSelectedKeyword();
+        if (fieldName.isPresent() && keywordToRemove.isPresent()) {
+            viewModel.showRemoveKeywordConfirmationDialog(fieldName.get(), keywordToRemove.get());
+        }
+    }
+
+    private void initListView(ListView<String> listViewToInit, Supplier<ListProperty<String>> backingList) {
+        listViewToInit.itemsProperty().bind(backingList.get());
+        listViewToInit.getSelectionModel().selectFirst();
+    }
+
+    private Optional<String> getSelectedFieldName() {
+        return Optional.of(fieldNamesListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
+    }
+
+    private Optional<String> getSelectedKeyword() {
+        return Optional.of(keywordsListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
+    }
+
+    private void saveChangesAndClose() {
+        viewModel.saveChanges();
+        close();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
new file mode 100644
index 00000000000..4ee85925310
--- /dev/null
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -0,0 +1,213 @@
+package org.jabref.gui.contentselector;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.FieldName;
+import org.jabref.model.metadata.ContentSelector;
+import org.jabref.model.metadata.MetaData;
+
+import static com.google.common.collect.ImmutableList.of;
+
+class ContentSelectorDialogViewModel extends AbstractViewModel {
+
+    private static final List<String> DEFAULT_FIELD_NAMES = of(FieldName.AUTHOR, FieldName.JOURNAL, FieldName.KEYWORDS, FieldName.PUBLISHER);
+
+    private final BasePanel basePanel;
+    private final MetaData metaData;
+    private final DialogService dialogService;
+    private final Map<String, List<String>> fieldNameKeywordsMap = new HashMap<>();
+
+    private ListProperty<String> fieldNames = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private ListProperty<String> keywords = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private StringProperty selectedFieldName = new SimpleStringProperty();
+    private StringProperty selectedKeyword = new SimpleStringProperty();
+
+    ContentSelectorDialogViewModel(BasePanel basePanel, DialogService dialogService) {
+        this.basePanel = basePanel;
+        this.metaData = basePanel.getBibDatabaseContext().getMetaData();
+        this.dialogService = dialogService;
+        populateFieldNameKeywordsMapWithExistingValues();
+        populateFieldNamesListWithValues();
+    }
+
+    private void populateFieldNamesListWithValues() {
+        List<String> existingFieldNames = new ArrayList<>(fieldNameKeywordsMap.keySet());
+        Collections.sort(existingFieldNames);
+        fieldNames.addAll(existingFieldNames);
+
+        if (fieldNames.isEmpty()) {
+            DEFAULT_FIELD_NAMES.forEach(this::addFieldNameIfUnique);
+        }
+    }
+
+    private void populateFieldNameKeywordsMapWithExistingValues() {
+        metaData.getContentSelectors().getContentSelectors().forEach(
+                existingContentSelector -> fieldNameKeywordsMap.put(existingContentSelector.getFieldName(), new ArrayList<>(existingContentSelector.getValues()))
+        );
+    }
+
+    ListProperty<String> getFieldNamesBackingList() {
+        return fieldNames;
+    }
+
+    StringProperty selectedFieldNameProperty() {
+        return selectedFieldName;
+    }
+
+    BooleanBinding isFieldNameListEmpty() {
+        return Bindings.isEmpty(fieldNames);
+    }
+
+    BooleanBinding isNoFieldNameSelected() {
+        return Bindings.isEmpty(selectedFieldName);
+    }
+
+    ListProperty<String> getKeywordsBackingList() {
+        return keywords;
+    }
+
+    StringProperty selectedKeywordProperty() {
+        return selectedKeyword;
+    }
+
+    BooleanBinding isNoKeywordSelected() {
+        return Bindings.isEmpty(selectedKeyword);
+    }
+
+    void showInputFieldNameDialog() {
+        dialogService.showInputDialogAndWait(Localization.lang("Add new field name"), Localization.lang("Field name:"))
+                .ifPresent(this::addFieldNameIfUnique);
+    }
+
+    private void addFieldNameIfUnique(String fieldNameToAdd) {
+        boolean exists = fieldNameKeywordsMap.containsKey(fieldNameToAdd);
+        if (exists) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Field name \"%0\" already exists", fieldNameToAdd));
+            return;
+        }
+
+        fieldNameKeywordsMap.put(fieldNameToAdd, new ArrayList<>());
+        fieldNames.add(fieldNameToAdd);
+    }
+
+    void showRemoveFieldNameConfirmationDialog(String fieldNameToRemove) {
+        if (fieldNameToRemove == null) {
+            dialogService.showErrorDialogAndWait(Localization.lang("No field name selected!"));
+            return;
+        }
+
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(
+                Localization.lang("Remove field name"),
+                Localization.lang("Are you sure you want to remove field name: \"%0\"?", fieldNameToRemove)
+        );
+
+        if (deleteConfirmed) {
+            removeFieldName(fieldNameToRemove);
+        }
+    }
+
+    private void removeFieldName(String fieldNameToRemove) {
+        fieldNameKeywordsMap.remove(fieldNameToRemove);
+        fieldNames.remove(fieldNameToRemove);
+    }
+
+    void populateKeywords(String selectedFieldName) {
+        keywords.clear();
+        if (selectedFieldName != null) {
+            keywords.addAll(fieldNameKeywordsMap.get(selectedFieldName));
+        }
+    }
+
+    void showInputKeywordDialog(String selectedFieldName) {
+        dialogService.showInputDialogAndWait(Localization.lang("Add new keyword"), Localization.lang("Keyword:"))
+                .ifPresent(newKeyword -> addKeywordIfUnique(selectedFieldName, newKeyword));
+    }
+
+    private void addKeywordIfUnique(String fieldName, String keywordToAdd) {
+        boolean exists = fieldNameKeywordsMap.get(fieldName).contains(keywordToAdd);
+        if (exists) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Keyword \"%0\" already exists", keywordToAdd));
+            return;
+        }
+
+        List<String> existingKeywords = fieldNameKeywordsMap.getOrDefault(fieldName, new ArrayList<>());
+        existingKeywords.add(keywordToAdd);
+        fieldNameKeywordsMap.put(fieldName, existingKeywords);
+        keywords.add(keywordToAdd);
+        populateKeywords(fieldName);
+    }
+
+    void showRemoveKeywordConfirmationDialog(String fieldName, String keywordToRemove) {
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(Localization.lang("Remove keyword"), Localization.lang("Are you sure you want to remove keyword: \"%0\"?", keywordToRemove));
+        if (deleteConfirmed) {
+            removeKeyword(fieldName, keywordToRemove);
+        }
+    }
+
+    private void removeKeyword(String fieldName, String keywordToRemove) {
+        fieldNameKeywordsMap.get(fieldName).remove(keywordToRemove);
+        keywords.remove(keywordToRemove);
+    }
+
+    void saveChanges() {
+        List<String> metaDataFieldNames = metaData.getContentSelectors().getFieldNamesWithSelectors();
+        fieldNameKeywordsMap.forEach((fieldName, keywords) -> updateMetaDataContentSelector(metaDataFieldNames, fieldName, keywords));
+
+        List<String> fieldNamesToRemove = filterFieldNamesToRemove();
+        fieldNamesToRemove.forEach(metaData::clearContentSelectors);
+
+        basePanel.setupMainPanel();
+        basePanel.markNonUndoableBaseChanged();
+    }
+
+    private List<String> filterFieldNamesToRemove() {
+        Set<String> newlyAddedKeywords = fieldNameKeywordsMap.keySet();
+        return metaData.getContentSelectors().getFieldNamesWithSelectors().stream()
+                .filter(fieldName -> !newlyAddedKeywords.contains(fieldName))
+                .collect(Collectors.toList());
+    }
+
+    private void updateMetaDataContentSelector(List<String> existingFieldNames, String fieldName, List<String> keywords) {
+        boolean fieldNameDoNotExists = !existingFieldNames.contains(fieldName);
+        if (fieldNameDoNotExists) {
+            metaData.addContentSelector(new ContentSelector(fieldName, keywords));
+        }
+
+        if (keywordsHaveChanged(fieldName, keywords)) {
+            metaData.clearContentSelectors(fieldName);
+            metaData.addContentSelector(new ContentSelector(fieldName, keywords));
+        }
+    }
+
+    private boolean keywordsHaveChanged(String fieldName, List<String> keywords) {
+        HashSet<String> keywordsSet = asHashSet(keywords);
+        List<String> existingKeywords = metaData.getContentSelectorValuesForField(fieldName);
+        if (!keywordsSet.equals(asHashSet(existingKeywords))) {
+            return true;
+        }
+        return !keywordsSet.isEmpty() && existingKeywords.isEmpty();
+    }
+
+    private HashSet<String> asHashSet(List<String> listToConvert) {
+        return new HashSet<>(listToConvert);
+    }
+}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 634a80d312c..9275461a40a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -12,9 +12,6 @@
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 matches the term <b>%1</b>
 
-<field\ name>=<field name>
-
-<select\ word>=<select word>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abbreviate journal names of the selected entries (ISO abbreviation)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abbreviate journal names of the selected entries (MEDLINE abbreviation)
 
@@ -1470,7 +1467,6 @@ Move\ to\ group=Move to group
 
 Clear\ read\ status=Clear read status
 Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Convert to biblatex format (for example, move the value of the 'journal' field to 'journaltitle')
-Could\ not\ apply\ changes.=Could not apply changes.
 Deprecated\ fields=Deprecated fields
 No\ read\ status\ information=No read status information
 Printed=Printed
@@ -2175,4 +2171,17 @@ Error\ adding\ discovered\ CitationStyles=Error adding discovered CitationStyles
 Add\ new\ String=Add new String
 Remove\ selected\ Strings=Remove selected Strings
 Must\ not\ be\ empty\!=Must not be empty\!
-Open\ Help\ page=Open Help page
\ No newline at end of file
+Open\ Help\ page=Open Help page
+
+Active\ database\ connection\ do\ not\ exists\!=Active database connection do not exists!
+Add\ new\ field\ name=Add new field name
+Field\ name\:=Field name:
+Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists
+No\ field\ name\ selected\!=No field name selected!
+Remove\ field\ name=Remove field name
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ \"%0\"?=Are you sure you want to remove field name: "%0"?
+Add\ new\ keyword=Add new keyword
+Keyword\:=Keyword:
+Keyword\ \"%0\"\ already\ exists=Keyword "%0" already exists
+Remove\ keyword=Remove keyword
+Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ \"%0\"?=Are you sure you want to remove keyword: "%0"?