diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
index c5d1aa5b2c5..3695201ca61 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
@@ -7,11 +7,11 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.CheckBoxTableCell;
 
-import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.BindingsHelper;
@@ -36,6 +36,7 @@ public class ProtectedTermsTab extends AbstractPreferenceTabView<ProtectedTermsT
     @FXML private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableDeleteColumn;
 
     @Inject private ProtectedTermsLoader termsLoader;
+    @Inject private KeyBindingRepository keyBindingRepository;
 
     public ProtectedTermsTab() {
         ViewLoader.view(this)
@@ -87,7 +88,7 @@ public void initialize() {
     }
 
     private ContextMenu createContextMenu(ProtectedTermsListItemModel file) {
-        ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+        ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
         contextMenu.getItems().addAll(
                 factory.createMenuItem(StandardActions.EDIT_LIST, new ProtectedTermsTab.ContextAction(StandardActions.EDIT_LIST, file)),
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index 57a80d60bf7..06ee5a0e0dd 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -30,10 +30,10 @@
     <Label styleClass="sectionHeader" text="%Catalogues used for 'Search Selected'"/>
     <TableView
             fx:id="catalogTable"
-            HBox.hgrow="ALWAYS"
+            VBox.vgrow="ALWAYS"
             editable="true">
         <columns>
-            <TableColumn
+            <TableColumn minWidth="90" prefWidth="70"
                     fx:id="catalogEnabledColumn"
                     text="%Enabled"
                     />
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 9492738963a..1ba2ef247fe 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -39,6 +39,8 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
+import kong.unirest.UnirestException;
+
 public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty enableWebSearchProperty = new SimpleBooleanProperty();
     private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
@@ -114,7 +116,11 @@ public void storeSettings() {
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
-        importerPreferences.setCatalogs(FXCollections.observableList(catalogs.stream().filter(StudyCatalogItem::isEnabled).map(StudyCatalogItem::getName).collect(Collectors.toList())));
+        importerPreferences.setCatalogs(
+                FXCollections.observableList(catalogs.stream()
+                                                     .filter(StudyCatalogItem::isEnabled)
+                                                     .map(StudyCatalogItem::getName)
+                                                     .collect(Collectors.toList())));
         importerPreferences.setPersistCustomKeys(apikeyPersistProperty.get());
         preferencesService.getImporterPreferences().getApiKeys().clear();
         if (apikeyPersistAvailableProperty.get()) {
@@ -215,7 +221,7 @@ public void checkCustomApiKey() {
                 keyValid = (statusCode >= 200) && (statusCode < 300);
 
                 URLDownload.setSSLVerification(defaultSslSocketFactory, defaultHostnameVerifier);
-            } catch (IOException | kong.unirest.UnirestException e) {
+            } catch (IOException | UnirestException e) {
                 keyValid = false;
             }
         } else {
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index bd6217e7e21..c706ff46799 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -6,10 +6,8 @@
 import java.util.Set;
 
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -27,7 +25,7 @@ public class ImporterPreferences {
     private final ObservableSet<FetcherApiKey> apiKeys;
     private final ObservableSet<CustomImporter> customImporters;
     private final BooleanProperty persistCustomKeys;
-    private final ListProperty<String> catalogs;
+    private final ObservableList<String> catalogs;
     public ImporterPreferences(boolean importerEnabled,
                                boolean generateNewKeyOnImport,
                                Path importWorkingDirectory,
@@ -43,7 +41,7 @@ public ImporterPreferences(boolean importerEnabled,
         this.customImporters = FXCollections.observableSet(customImporters);
         this.apiKeys = FXCollections.observableSet(apiKeys);
         this.persistCustomKeys = new SimpleBooleanProperty(persistCustomKeys);
-        this.catalogs = new SimpleListProperty<>(FXCollections.observableArrayList(catalogs));
+        this.catalogs = FXCollections.observableArrayList(catalogs);
     }
 
     public boolean areImporterEnabled() {
@@ -127,18 +125,12 @@ public Optional<String> getApiKey(String name) {
                       .map(FetcherApiKey::getKey);
     }
 
-    public void setCatalogs(ObservableList<String> catalogs) {
-        this.catalogs.set(catalogs);
+    public void setCatalogs(List<String> catalogs) {
+        this.catalogs.clear();
+        this.catalogs.addAll(catalogs);
     }
 
     public ObservableList<String> getCatalogs() {
-        if (catalogs.get() == null) {
-            catalogs.set(FXCollections.observableArrayList());
-        }
-        return catalogs.get();
-    }
-
-    public ListProperty<String> catalogsProperty() {
-        return catalogs;
+          return catalogs;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 9e513239c35..8a3f741a452 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -234,7 +234,9 @@ public static Set<CustomizableKeyFetcher> getCustomizableKeyFetchers(ImportForma
     }
 }
 
-// Place "Search Selected" to the first of the set
+/**
+ *  Places "Search Selected" to the first of the set
+ */
 class CompositeSearchFirstComparator implements Comparator<SearchBasedFetcher> {
     @Override
     public int compare(SearchBasedFetcher s1, SearchBasedFetcher s2) {
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index d0ed7255982..19e87669bf8 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -32,7 +32,6 @@
 import java.util.stream.Stream;
 
 import javafx.beans.InvalidationListener;
-import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.SetChangeListener;
@@ -2822,7 +2821,7 @@ public ImporterPreferences getImporterPreferences() {
                 getCustomImportFormats(),
                 getFetcherKeys(),
                 getBoolean(FETCHER_CUSTOM_KEY_PERSIST),
-                FXCollections.observableList(getStringList(SEARCH_CATALOGS)));
+                getStringList(SEARCH_CATALOGS));
 
         EasyBind.listen(importerPreferences.importerEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(IMPORTERS_ENABLED, newValue));
         EasyBind.listen(importerPreferences.generateNewKeyOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
@@ -2831,7 +2830,7 @@ public ImporterPreferences getImporterPreferences() {
         EasyBind.listen(importerPreferences.persistCustomKeysProperty(), (obs, oldValue, newValue) -> putBoolean(FETCHER_CUSTOM_KEY_PERSIST, newValue));
         importerPreferences.getApiKeys().addListener((InvalidationListener) c -> storeFetcherKeys(importerPreferences.getApiKeys()));
         importerPreferences.getCustomImporters().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImporters()));
-        EasyBind.listen(importerPreferences.catalogsProperty(), (obs, oldValue, newValue) -> putStringList(SEARCH_CATALOGS, importerPreferences.catalogsProperty()));
+        importerPreferences.getCatalogs().addListener((InvalidationListener) c -> putStringList(SEARCH_CATALOGS, importerPreferences.getCatalogs()));
 
         return importerPreferences;
     }