diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index 4d05f3de4d..a90fdda01d 100644
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -342,7 +342,7 @@ wxString wxAcceleratorEntry::ToString() const
                  // build as they're only defined for the ASCII range (or EOF)
                  wxIsascii(code) &&
 #endif // ANSI
-                    wxIsalnum(code) )
+                    wxIsprint(code) )
             {
                 text << (wxChar)code;
             }
diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 0892b1bfe9..71fdc44dee 100644
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -302,6 +302,9 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
         STOCKITEM(wxID_REPLACE,             wxACCEL_CTRL,'R')
         STOCKITEM(wxID_SAVE,                wxACCEL_CTRL,'S')
         STOCKITEM(wxID_UNDO,                wxACCEL_CTRL,'Z')
+#ifdef __WXOSX__
+        STOCKITEM(wxID_PREFERENCES,         wxACCEL_CTRL,',')
+#endif
 
         default:
             // set the wxAcceleratorEntry to return into an invalid state: