diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 0e8691cec9..cc81b7b09a 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1572,13 +1572,17 @@ void GUI_App::init_networking_callbacks()
         //    });
 
         m_agent->set_server_callback([this](std::string url, int status) {
-            if (!m_server_error_dialog) {
-                m_server_error_dialog = new NetworkErrorDialog(mainframe);
-            }
 
-            if (!m_server_error_dialog->IsShown()) {
+            CallAfter([this]() {
+                if (m_server_error_dialog) {
+                    m_server_error_dialog->EndModal(wxCLOSE);
+                    m_server_error_dialog->Destroy();
+                    m_server_error_dialog = nullptr;
+                }
+
+                m_server_error_dialog = new NetworkErrorDialog(mainframe);
                 m_server_error_dialog->ShowModal();
-            }
+            });
         });
 
 
diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index 7be96c48d6..b9d168b8f5 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -710,7 +710,6 @@ NetworkErrorDialog::NetworkErrorDialog(wxWindow* parent)
     m_text_wiki->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); });
 
     sizer_help->Add(m_text_proposal, 0, wxEXPAND, 0);
-    sizer_main->Add(0, 0, 0, wxTOP, 6);
     sizer_help->Add(m_text_wiki, 0, wxALL, 0);
 
     wxBoxSizer* sizer_button = new wxBoxSizer(wxHORIZONTAL);
@@ -735,7 +734,7 @@ NetworkErrorDialog::NetworkErrorDialog(wxWindow* parent)
     sizer_main->Add(sizer_bacis_text, 0, wxEXPAND | wxLEFT | wxRIGHT, 15);
     sizer_main->Add(0, 0, 0, wxTOP, 6);
     sizer_main->Add(sizer_link, 0, wxLEFT | wxRIGHT, 15);
-    sizer_main->Add(0, 0, 0, wxEXPAND | wxTOP, 8);
+    sizer_main->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(20));
     sizer_main->Add(sizer_help, 1, wxLEFT | wxRIGHT, 15);
     sizer_main->Add(0, 0, 0, wxEXPAND | wxTOP, 8);
     sizer_main->Add(sizer_button, 1, wxEXPAND | wxLEFT | wxRIGHT, 15);