diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 3ac2c5d5af..5dcecf9614 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -544,6 +544,10 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
                     }
                     else
                     {
+                        // Check if user wants to warp the mouse to origin of moved object
+                        if( !editFrame->GetMoveWarpsCursor() )
+                            m_cursor = originalCursorPos; // No, so use original mouse pos instead
+
                         selection.SetReferencePoint( m_cursor );
                         grid.SetAuxAxes( true, m_cursor );
                     }