diff --git a/XS7.cpp b/XS7.cpp
index 3cbe2d6..ea8f7ff 100644
--- a/XS7.cpp
+++ b/XS7.cpp
@@ -75,6 +75,12 @@ void XS7::OnClose(wxCloseEvent& evt)
     evt.Skip(false);
     return;
   }
+  if(m_insaneWidget->IsScanning())
+  {
+    m_insaneWidget->CancelScanning();
+    evt.Skip(false); // The window remains open.
+    return;
+  }
   evt.Skip();
   
 }