diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index e6aaad55cb..af13f79098 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -382,6 +382,9 @@ int EDIT_TOOL::Main( const TOOL_EVENT& aEvent )
 
     bool unselect = selection.IsHover();
 
+    if( m_dragging )
+        return 0;
+
     Activate();
 
     m_dragging = false;         // Are selected items being dragged?