diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
index 74c367e08e..d8fa899a23 100644
--- a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
@@ -15,7 +15,16 @@ namespace NintendoSwitch{
 
 std::vector<std::unique_ptr<EditableTableRow>> ProControllerFromKeyboardTable::make_defaults(){
     std::vector<std::unique_ptr<EditableTableRow>> ret;
-
+#if defined(__APPLE__)
+    ret.emplace_back(make_mapping("Dpad Up",            KeyboardKey::KEY_8,      ProControllerDeltas{.dpad_x =  0, .dpad_y = -1}));
+    ret.emplace_back(make_mapping("Dpad Up+Right",      KeyboardKey::KEY_9,      ProControllerDeltas{.dpad_x = +1, .dpad_y = -1}));
+    ret.emplace_back(make_mapping("Dpad Right",         KeyboardKey::KEY_6,      ProControllerDeltas{.dpad_x = +1, .dpad_y =  0}));
+    ret.emplace_back(make_mapping("Dpad Down+Right",    KeyboardKey::KEY_3,      ProControllerDeltas{.dpad_x = +1, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Down",          KeyboardKey::KEY_2,      ProControllerDeltas{.dpad_x =  0, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Down+Left",     KeyboardKey::KEY_1,      ProControllerDeltas{.dpad_x = -1, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Left",          KeyboardKey::KEY_4,      ProControllerDeltas{.dpad_x = -1, .dpad_y =  0}));
+    ret.emplace_back(make_mapping("Dpad Up+Left",       KeyboardKey::KEY_7,      ProControllerDeltas{.dpad_x = -1, .dpad_y = -1}));
+#else
     ret.emplace_back(make_mapping("Dpad Up",            KeyboardKey::KEY_KP_8,      ProControllerDeltas{.dpad_x =  0, .dpad_y = -1}));
     ret.emplace_back(make_mapping("Dpad Up+Right",      KeyboardKey::KEY_KP_9,      ProControllerDeltas{.dpad_x = +1, .dpad_y = -1}));
     ret.emplace_back(make_mapping("Dpad Right",         KeyboardKey::KEY_KP_6,      ProControllerDeltas{.dpad_x = +1, .dpad_y =  0}));
@@ -24,7 +33,7 @@ std::vector<std::unique_ptr<EditableTableRow>> ProControllerFromKeyboardTable::m
     ret.emplace_back(make_mapping("Dpad Down+Left",     KeyboardKey::KEY_KP_1,      ProControllerDeltas{.dpad_x = -1, .dpad_y = +1}));
     ret.emplace_back(make_mapping("Dpad Left",          KeyboardKey::KEY_KP_4,      ProControllerDeltas{.dpad_x = -1, .dpad_y =  0}));
     ret.emplace_back(make_mapping("Dpad Up+Left",       KeyboardKey::KEY_KP_7,      ProControllerDeltas{.dpad_x = -1, .dpad_y = -1}));
-
+#endif
     ret.emplace_back(make_mapping("Left-Stick Up",      KeyboardKey::KEY_W,         ProControllerDeltas{.left_x =  0, .left_y = -1}));
     ret.emplace_back(make_mapping("Left-Stick Left",    KeyboardKey::KEY_A,         ProControllerDeltas{.left_x = -1, .left_y =  0}));
     ret.emplace_back(make_mapping("Left-Stick Down",    KeyboardKey::KEY_S,         ProControllerDeltas{.left_x =  0, .left_y = +1}));