diff --git a/docs/changes.txt b/docs/changes.txt
index 29b83430d1..fd70022aac 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -637,6 +637,7 @@ wxOSX:
 - Fix using wxHTTP and wxFTP from worker thread.
 - Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).
 - Fix wxSearchCtrl appearance under 10.10 (John Roberts).
+- Fix handling of "Cancel" button in wxSearchCtrl (John Roberts).
 - Generate correct events for WXK_NUMPAD_ENTER (John Roberts).
 - Fix handling of WXK_NUMPAD_ENTER in wxTextCtrl (John Roberts).
 - Send wxIconizeEvent when a window is iconized/restore (Rob Krakora).
diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm
index 2525391bef..8549d8d944 100644
--- a/src/osx/cocoa/srchctrl.mm
+++ b/src/osx/cocoa/srchctrl.mm
@@ -155,7 +155,7 @@ public :
         if ( wxpeer )
         {
             NSString *searchString = [m_searchField stringValue];
-            if ( searchString == nil )
+            if ( searchString == nil || !searchString.length )
             {
                 wxpeer->HandleSearchFieldCancelHit();
             }