diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp
index b9e4d60c2a..0faa4cc78e 100644
--- a/eeschema/sch_base_frame.cpp
+++ b/eeschema/sch_base_frame.cpp
@@ -190,7 +190,7 @@ void SCH_BASE_FRAME::SetScreen(  BASE_SCREEN* aScreen )
 
     if( m_toolManager )
     {
-        m_toolManager->SetEnvironment( GetScreen(), GetCanvas()->GetView(),
+        m_toolManager->SetEnvironment( aScreen, GetCanvas()->GetView(),
                                        GetCanvas()->GetViewControls(), this );
     }
 }