diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index 158830c764..ca6c186fa2 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -532,7 +532,7 @@ void PCB_EDIT_FRAME::setupTools()
 {
     // Create the manager and dispatcher & route draw panel events to the dispatcher
     m_toolManager = new TOOL_MANAGER;
-    m_toolManager->SetEnvironment( NULL, GetGalCanvas()->GetView(),
+    m_toolManager->SetEnvironment( m_Pcb, GetGalCanvas()->GetView(),
                                    GetGalCanvas()->GetViewControls(), this );
     m_toolDispatcher = new TOOL_DISPATCHER( m_toolManager );
 
@@ -661,6 +661,9 @@ void PCB_EDIT_FRAME::UseGalCanvas( bool aEnable )
 {
     EDA_DRAW_FRAME::UseGalCanvas( aEnable );
 
+    m_toolManager->SetEnvironment( m_Pcb, GetGalCanvas()->GetView(),
+                                   GetGalCanvas()->GetViewControls(), this );
+
     if( aEnable )
     {
         SetBoard( m_Pcb );