diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 8d89ab2aa0..68c43f8a8e 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -974,11 +974,14 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
     m_lastTargetLayer = targetLayer;
 
     if( m_router->RoutingInProgress() )
+    {
         updateEndItem( aEvent );
+        m_router->Move( m_endSnapPoint, m_endItem );
+    }
     else
+    {
         updateStartItem( aEvent );
-
-    m_router->Move( m_endSnapPoint, m_endItem );        // refresh
+    }
 
     return 0;
 }