diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index cd9f174b8..58409da21 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -1917,6 +1917,9 @@ void SelectMachineDialog::init_timer()
 
 void SelectMachineDialog::on_cancel(wxCloseEvent &event)
 {
+    if (m_mapping_popup.IsShown())
+        m_mapping_popup.Dismiss();
+
     if (m_print_job) {
         if (m_print_job->is_running()) {
             m_print_job->cancel();