diff --git a/docs/changes.txt b/docs/changes.txt
index 7cece1bb7a..76829f19d7 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -85,6 +85,7 @@ All (GUI):
 - wxListCtrl now sends an END_LABEL event if editing was cancelled, too
 - bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
 - status text is now restored after wxMenu help is shown in it
+- bug in wxWindow::RemoveEventHandler() fixed (Yingjun Zhang)
 
 wxMSW:
 
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index ecd50f6734..a45a930fae 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -812,7 +812,9 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
             {
                 handlerNext->SetPreviousHandler ( handlerPrev );
             }
+
             handler->SetNextHandler(NULL);
+            handler->SetPreviousHandler(NULL);
 
             return TRUE;
         }