diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index c11c5c8cb..45a1f4f81 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -193,7 +193,7 @@ template<> inline const t_config_enum_values& ConfigOptionEnum<WipeAlgo>::get_en
 
 template<> inline const t_config_enum_values& ConfigOptionEnum<GCodeFlavor>::get_enum_values() {
     static t_config_enum_values keys_map = {
-        {"reprap", gcfRepRap},
+        {"reprapfirmware", gcfRepRap},
         {"repetier", gcfRepetier},
         {"teacup", gcfTeacup},
         {"makerware", gcfMakerWare},
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 6a5c235dd..42a92b8f1 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -109,7 +109,11 @@ void KBShortcutsDialog::fill_shortcuts()
             { "0-6", L("Camera view") },
             { "E", L("Show/Hide object/instance labels") },
             // Configuration
+#ifdef __APPLE__
+            { ctrl + ",", L("Preferences") },
+#else
             { ctrl + "P", L("Preferences") },
+#endif
             // Help
             { "?", L("Show keyboard shortcuts list") }
         };