diff --git a/common/draw_frame.cpp b/common/draw_frame.cpp
index 0d8030953f..b43d1669d0 100644
--- a/common/draw_frame.cpp
+++ b/common/draw_frame.cpp
@@ -1033,6 +1033,9 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
     m_auimgr.GetPane( wxT( "DrawFrameGal" ) ).Show( aEnable );
     m_auimgr.Update();
 
+    // Reset current tool on switch();
+    SetToolID( ID_NO_TOOL_SELECTED, wxCURSOR_DEFAULT, wxEmptyString );
+
     m_galCanvasActive = aEnable;
 }