diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 18c605ce0f..37fa415de4 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -4582,19 +4582,19 @@ bool GUI_App::show_modal_ip_address_enter_dialog(wxString title)
     dlg.Bind(EVT_ENTER_IP_ADDRESS, [this, obj](wxCommandEvent& e) {
         auto selection_data_arr = wxSplit(e.GetString().ToStdString(), '|');
 
-        if (selection_data_arr.size() != 2) return;
+        if (selection_data_arr.size() == 2) {
+            auto ip_address = selection_data_arr[0];
+            auto access_code = selection_data_arr[1];
 
-        auto ip_address = selection_data_arr[0];
-        auto access_code = selection_data_arr[1];
+            BOOST_LOG_TRIVIAL(info) << "User enter IP address is " << ip_address;
+            if (!ip_address.empty()) {
+                wxGetApp().app_config->set_str("ip_address", obj->dev_id, ip_address.ToStdString());
+                wxGetApp().app_config->save();
 
-        BOOST_LOG_TRIVIAL(info) << "User enter IP address is " << ip_address;
-        if (!ip_address.empty()) {
-            wxGetApp().app_config->set_str("ip_address", obj->dev_id, ip_address.ToStdString());
-            wxGetApp().app_config->save();
-
-            obj->dev_ip = ip_address.ToStdString();
-            obj->set_user_access_code(access_code.ToStdString());
-        }    
+                obj->dev_ip = ip_address.ToStdString();
+                obj->set_user_access_code(access_code.ToStdString());
+            }
+        }
     });
 
     if (dlg.ShowModal() == wxID_YES) {
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
index 4992c1895f..a90341bd3f 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
@@ -243,6 +243,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
         if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) {
             m_failed_retry = 0;
             m_next_retry   = wxDateTime::Now();
+            return;
         }
     }
     if (m_next_retry.IsValid())
diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp
index 0bdcd1d679..d87e4fbf0b 100644
--- a/src/slic3r/GUI/ReleaseNote.cpp
+++ b/src/slic3r/GUI/ReleaseNote.cpp
@@ -1044,7 +1044,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent)
 
     Bind(EVT_CLOSE_IPADDRESS_DLG, [this](auto& e) {
         m_status_bar->reset();
-        this->EndModal(wxID_OK);
+        EndModal(wxID_YES);
     });
     Bind(wxEVT_CLOSE_WINDOW, [this](auto& e) {on_cancel();});
 }
@@ -1134,6 +1134,7 @@ void InputIpAddressDialog::on_ok(wxMouseEvent& evt)
         auto event_close = wxCommandEvent(EVT_CLOSE_IPADDRESS_DLG);
         event_close.SetEventObject(this);
         wxPostEvent(this, event_close);
+        return;
     }
 
     m_button_ok->Enable(false);