diff --git a/docs/changes.txt b/docs/changes.txt
index 208afe99d1..6fb2a18465 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -185,6 +185,10 @@ All:
 
 - Spanish translations updated (Javier San Jose)
 
+All (GUI):
+
+- bug in wxWindow::RemoveEventHandler() fixed (Yingjun Zhang)
+
 wxMSW:
 
 - strip ampersands from strings returned by wxMenuBar::GetLabelTop()
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index e19fa56716..5815b3057d 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -788,7 +788,9 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
             {
                 handlerNext->SetPreviousHandler ( handlerPrev );
             }
+
             handler->SetNextHandler(NULL);
+            handler->SetPreviousHandler(NULL);
 
             return TRUE;
         }