diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 57cdf7f8307..1ee881737c9 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -18,17 +18,16 @@
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.keyboard.TextInputKeyBindings;
-import org.jabref.gui.preferences.PreferencesDialogView;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.net.ProxyRegisterer;
 import org.jabref.logic.shared.DatabaseNotSupportedException;
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
 import org.jabref.logic.util.WebViewStore;
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.JabRefPreferences;
 
 import impl.org.controlsfx.skin.DecorationPane;
 import org.slf4j.Logger;
@@ -65,11 +64,13 @@ public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank,
                 preferencesService.getInternalPreferences())
                 .checkForNewVersionDelayed();
 
-        if (JabRefPreferences.getInstance().getProxyPreferences().shouldUseAuthentication()){
+        if (preferencesService.getProxyPreferences().shouldUseAuthentication()){
             DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-            PreferencesDialogView preferencesDialogView = new PreferencesDialogView(this.mainFrame);
-            preferencesDialogView.getPreferenceTabList().getSelectionModel().select(20);
-            dialogService.showCustomDialog(preferencesDialogView);
+            dialogService.showPasswordDialogAndWait("Proxy configuration", "Proxy requires password","Password")
+                .ifPresent(newPassword -> {
+                    preferencesService.getProxyPreferences().setPassword(newPassword);
+                    ProxyRegisterer.register(preferencesService.getProxyPreferences());
+                });
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 089b09f693a..f3a5c245913 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -67,8 +67,6 @@ public PreferencesDialogViewModel getViewModel() {
         return viewModel;
     }
 
-    public ListView<PreferencesTab> getPreferenceTabList() {return preferenceTabList;}
-
     @FXML
     private void initialize() {
         viewModel = new PreferencesDialogViewModel(dialogService, preferencesService, frame);