diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 1ab66f60e0..0884e72601 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -602,8 +602,10 @@ void ROUTER_TOOL::performRouting()
         }
         else if( evt->IsAction( &ACT_EndTrack ) )
         {
-            if( m_router->FixRoute( m_endSnapPoint, m_endItem ) )
-                break;
+            bool still_routing = true;
+            while( still_routing )
+                still_routing = m_router->FixRoute( m_endSnapPoint, m_endItem );
+            break;
         }
 
         handleCommonEvents( *evt );