diff --git a/wxPython/demo/ListCtrl.py b/wxPython/demo/ListCtrl.py
index 7ef63aaf29..4f3ad75586 100644
--- a/wxPython/demo/ListCtrl.py
+++ b/wxPython/demo/ListCtrl.py
@@ -205,7 +205,7 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin):
         self.log.WriteText("x, y = %s\n" % str((x, y)))
         item, flags = self.list.HitTest((x, y))
 
-        if flags & wx.LIST_HITTEST_ONITEM:
+        if item != wx.NOT_FOUND and flags & wx.LIST_HITTEST_ONITEM:
             self.list.Select(item)
 
         event.Skip()
@@ -354,6 +354,9 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin):
 
 #---------------------------------------------------------------------------
 
+# for testing the new native control on wxMac
+#wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 0)
+
 def runTest(frame, nb, log):
     win = TestListCtrlPanel(nb, log)
     return win
diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index c052337dd6..d53789b681 100644
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -446,7 +446,9 @@ IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage);
 
 
 
-
+// NOTE: The following option is set in _settings.i
+//     # Until the new native control for wxMac is up to par, still use the generic one.
+//     SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1)
 
 MustHaveApp(wxPyListCtrl);
 
diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 3f4a0c88bc..f45d1fe3b9 100644
--- a/wxPython/src/_settings.i
+++ b/wxPython/src/_settings.i
@@ -205,4 +205,10 @@ public:
 
 
 
+%pythoncode {
+    %# Until the new native control for wxMac is up to par, still use the generic one.
+    SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1)
+}
+
+
 //---------------------------------------------------------------------------