diff --git a/eeschema/tools/ee_point_editor.cpp b/eeschema/tools/ee_point_editor.cpp
index 263ee6ea3c..25aa6e9f69 100644
--- a/eeschema/tools/ee_point_editor.cpp
+++ b/eeschema/tools/ee_point_editor.cpp
@@ -438,6 +438,7 @@ int EE_POINT_EDITOR::Main( const TOOL_EVENT& aEvent )
 
     controls->SetAutoPan( false );
     controls->CaptureCursor( false );
+    setEditedPoint( nullptr );
 
     if( m_editPoints )
     {