diff --git a/docs/changes.txt b/docs/changes.txt
index bd03e5344d..80dd4c7cfd 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -145,6 +145,8 @@ wxGTK:
 
 wxMac:
 
+- Fixed a glitch where clicking on a scrollbar (but not moving the scrollbar)
+  would cause the window to scroll.
 
 2.8.8
 -----
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index e39d095980..6078d93815 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1352,6 +1352,11 @@ void wxScrollHelper::HandleOnChildFocus(wxChildFocusEvent& event)
     if ( win == m_targetWindow )
         return; // nothing to do
 
+#ifdef __WXMAC__
+    if (wxDynamicCast(win, wxScrollBar))
+        return;
+#endif
+
     // Fixing ticket: http://trac.wxwidgets.org/ticket/9563
     // When a child inside a wxControlContainer receives a focus, the
     // wxControlContainer generates an artificial wxChildFocusEvent for