3 files changed, 18 insertions, 1 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 501557c8c..c8c0256ee 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -246,6 +246,7 @@ void ServerDialog::connectToSelectedServer()
     mServerInfo->freeSources = server.freeSources;
     mServerInfo->nonFreeSources = server.nonFreeSources;
     mServerInfo->docs = server.docs;
+    mServerInfo->serverUrl = server.serverUrl;
 
     settings.persistentIp = mServerInfo->persistentIp;
     settings.supportUrl = mServerInfo->supportUrl;
@@ -316,7 +317,9 @@ void ServerDialog::action(const ActionEvent &event)
         const int index = mServersList->getSelected();
         if (index >= 0)
         {
-            CREATEWIDGET(ServerInfoWindow,
+            if (serverInfoWindow != nullptr)
+                serverInfoWindow->scheduleDelete();
+            serverInfoWindow = CREATEWIDGETR(ServerInfoWindow,
                 mServers.at(index));
         }
     }
diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp
index 660dd0241..c0099d356 100644
--- a/src/gui/windows/serverinfowindow.cpp
+++ b/src/gui/windows/serverinfowindow.cpp
@@ -33,6 +33,8 @@
 
 #include "debug.h"
 
+ServerInfoWindow *serverInfoWindow = nullptr;
+
 ServerInfoWindow::ServerInfoWindow(ServerInfo &serverInfo) :
     // TRANSLATORS: servers dialog name
     Window(_("Server info"), Modal_false, nullptr, "server_info.xml"),
@@ -170,3 +172,11 @@ void ServerInfoWindow::addServerComment(const std::string &url,
         mBrowserBox->addRow(str);
     }
 }
+
+void ServerInfoWindow::close()
+{
+    Window::close();
+    if (serverInfoWindow == this)
+        serverInfoWindow = nullptr;
+    scheduleDelete();
+}
diff --git a/src/gui/windows/serverinfowindow.h b/src/gui/windows/serverinfowindow.h
index f3e2b545e..699a00451 100644
--- a/src/gui/windows/serverinfowindow.h
+++ b/src/gui/windows/serverinfowindow.h
@@ -46,6 +46,8 @@ class ServerInfoWindow final : public Window,
         void handleLink(const std::string &link,
                         MouseEvent *const event A_UNUSED) override final;
 
+        void close() override final;
+
     protected:
         void showServerInfo();
 
@@ -61,4 +63,6 @@ class ServerInfoWindow final : public Window,
         ScrollArea *mScrollArea A_NONNULLPOINTER;
 };
 
+extern ServerInfoWindow *serverInfoWindow;
+
 #endif  // GUI_WINDOWS_SERVERINFOWINDOW_H