diff --git a/docs/changes.txt b/docs/changes.txt
index bc57b6eb0e..81ef7b5700 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -570,6 +570,15 @@ Major new features in this release
   was added.
 
 
+
+3.0.1: (released 2014-xx-xx)
+----------------------------
+
+All (GUI):
+
+- Fix crash when setting invalid label ending with "&" (ZaneUJi).
+
+
 3.0.0: (released 2013-11-11)
 ----------------------------
 
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f3a77d4161..0d30b0249b 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1205,6 +1205,7 @@ wxString wxStripMenuCodes(const wxString& in, int flags)
             if ( ++it == in.end() )
             {
                 wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str());
+                break;
             }
             else
             {