diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 83307b2b2e..e2ced0b169 100644
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -2313,6 +2313,9 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
                      (flags & wxTREE_HITTEST_ONITEMLABEL) &&
                      HasFlag(wxTR_EDIT_LABELS) )
                 {
+                    if ( m_renameTimer->IsRunning() )
+                        m_renameTimer->Stop();
+
                     m_renameTimer->Start( 100, TRUE );
                 }