diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index 6f562d95cb..005813ed10 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -923,6 +923,7 @@ int SCH_EDIT_TOOL::RepeatDrawItem( const TOOL_EVENT& aEvent )
                                  Mils2iu( cfg->m_Drawing.default_repeat_offset_y ) ) );
     }
 
+    m_toolMgr->RunAction( EE_ACTIONS::addItemToSel, true, newItem );
     newItem->SetFlags( IS_NEW );
     m_frame->AddToScreen( newItem, m_frame->GetScreen() );
     m_frame->SaveCopyInUndoList( m_frame->GetScreen(), newItem, UNDO_REDO::NEWITEM, false );
diff --git a/include/tool/selection.h b/include/tool/selection.h
index 96379c127c..c9516812f6 100644
--- a/include/tool/selection.h
+++ b/include/tool/selection.h
@@ -183,7 +183,10 @@ public:
 
     VECTOR2I GetReferencePoint() const
     {
-        return *m_referencePoint;
+        if( m_referencePoint )
+            return *m_referencePoint;
+        else
+            return GetBoundingBox().Centre();
     }
 
     void SetReferencePoint( const VECTOR2I& aP )