diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index a4e0a55fd6..a07283a1ac 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -185,6 +185,9 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
 
     m_viewControls->UpdateScrollbars();
 
+    if( !m_drawingEnabled )
+        return;
+
     if( !m_gal->IsVisible() )
         return;
 
@@ -388,10 +391,10 @@ void EDA_DRAW_PANEL_GAL::StartDrawing()
 
 void EDA_DRAW_PANEL_GAL::StopDrawing()
 {
+    m_refreshTimer.Stop();
     m_drawingEnabled = false;
     Disconnect( wxEVT_PAINT, wxPaintEventHandler( EDA_DRAW_PANEL_GAL::onPaint ), nullptr, this );
     m_pendingRefresh = false;
-    m_refreshTimer.Stop();
 }