diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 05ac0602d0..fb4924f17e 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2042,7 +2042,7 @@ void wxListTextCtrlWrapper::Finish()
     {
         m_finished = true;
 
-        m_text->PopEventHandler(this);
+        m_text->RemoveEventHandler(this);
         m_owner->FinishEditing(m_text);
 
         delete this;