diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index e0d13f48c5..6513475b7c 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -481,6 +481,7 @@ int EDIT_TOOL::Main( const TOOL_EVENT& aEvent )
                         }
                     }
 
+                    editFrame->UndoRedoBlock( true );
                     m_cursor = controls->GetCursorPosition();
 
                     if ( selection.HasReferencePoint() )
@@ -592,6 +593,8 @@ int EDIT_TOOL::Main( const TOOL_EVENT& aEvent )
     controls->SetAutoPan( false );
 
     m_dragging = false;
+    editFrame->UndoRedoBlock( false );
+
     // Discard reference point when selection is "dropped" onto the board (ie: not dragging anymore)
     selection.ClearReferencePoint();