diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index d8a4d12354..4371ef72c1 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -868,6 +868,8 @@ void SCH_EDIT_FRAME::doCloseWindow()
     if( m_toolManager )
     {
         m_toolManager->ShutdownAllTools();
+        // prevent the canvas from trying to dispatch events during close
+        GetCanvas()->SetEventDispatcher( nullptr );
         delete m_toolManager;
         m_toolManager = nullptr;
     }