diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 3fbbb7ac6f..9e2e9d1733 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -528,6 +528,9 @@ void FOOTPRINT_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
         }
     }
 
+    if( IsGalCanvasActive() )
+        GetGalCanvas()->StopDrawing();
+
     //close the editor
     Destroy();
 }