diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 4bce3cb905..657d124b66 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -1002,6 +1002,10 @@ int EDIT_TOOL::Rotate( const TOOL_EVENT& aEvent )
     if( m_dragging )
         m_toolMgr->RunAction( PCB_ACTIONS::updateLocalRatsnest, false );
 
+    // Clear reference so any mouse dragging that occurs doesn't make the selection jump
+    // to this now invalid reference
+    selection.ClearReferencePoint();
+
     return 0;
 }
 
@@ -1224,6 +1228,10 @@ int EDIT_TOOL::Flip( const TOOL_EVENT& aEvent )
     if( m_dragging )
         m_toolMgr->RunAction( PCB_ACTIONS::updateLocalRatsnest, false );
 
+    // Clear reference so any mouse dragging that occurs doesn't make the selection jump
+    // to this now invalid reference
+    selection.ClearReferencePoint();
+
     return 0;
 }