diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 34a35e4eb4..baa085fcf5 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -379,10 +379,22 @@ bool EDIT_TOOL::isRouterActive() const
 int EDIT_TOOL::Drag( const TOOL_EVENT& aEvent )
 {
     if( !m_toolMgr->GetTool<ROUTER_TOOL>() )
+    {
+        wxBell();
         return false; // don't drag when no router tool (i.e. fp editor)
+    }
 
     if( m_toolMgr->GetTool<ROUTER_TOOL>()->IsToolActive() )
+    {
+        wxBell();
         return false; // don't drag when router is already active
+    }
+
+    if( m_dragging )
+    {
+        wxBell();
+        return false; // don't do a router drag when already in an EDIT_TOOL drag
+    }
 
     int mode = PNS::DM_ANY;