diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index 84a4fbac4..0024f897b 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -27,11 +27,12 @@ and Emacs states, and for non-evil users.")
 ;;; Keybind settings
 
 (cond (IS-MAC
-       (setq mac-command-modifier     'super
-             mac-option-modifier      'meta
-             ns-command-modifier      'super
-             ns-option-modifier       'meta
-             ns-right-option-modifier 'none))
+       (setq mac-command-modifier      'super
+             ns-command-modifier       'super
+             mac-option-modifier       'meta
+             ns-option-modifier        'meta
+             mac-right-option-modifier 'none
+             ns-right-option-modifier  'none))
       (IS-WINDOWS
        (setq w32-lwindow-modifier 'super
              w32-rwindow-modifier 'super)))