diff --git a/pcbnew/tools/point_editor.cpp b/pcbnew/tools/point_editor.cpp
index 35b9afd37e..5ec3c193c9 100644
--- a/pcbnew/tools/point_editor.cpp
+++ b/pcbnew/tools/point_editor.cpp
@@ -299,11 +299,15 @@ int POINT_EDITOR::OnSelectionChange( const TOOL_EVENT& aEvent )
 
     const SELECTION& selection = m_selectionTool->GetSelection();
 
-    if( selection.Size() != 1 )
+    if( selection.Size() != 1 || selection.Front()->GetEditFlags() )
         return 0;
 
     Activate();
 
+    // On a rapid paste, paste, the Activate call can change the selection.
+    if( selection.Size() != 1 || selection.Front()->GetEditFlags() )
+        return 0;
+
     KIGFX::VIEW_CONTROLS* controls = getViewControls();
     KIGFX::VIEW* view = getView();
     PCB_BASE_EDIT_FRAME* editFrame = getEditFrame<PCB_BASE_EDIT_FRAME>();