diff --git a/client/src/templates/Challenges/classic/Editor.js b/client/src/templates/Challenges/classic/Editor.js
index e496fc83ae..2fc9965726 100644
--- a/client/src/templates/Challenges/classic/Editor.js
+++ b/client/src/templates/Challenges/classic/Editor.js
@@ -116,7 +116,7 @@ class Editor extends Component {
       label: 'Run tests',
       keybindings: [
         /* eslint-disable no-bitwise */
-        monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter)
+        monaco.KeyMod.chord(monaco.KeyMod.WinCtrl | monaco.KeyCode.Enter)
       ],
       run: this.props.executeChallenge
     });
diff --git a/client/src/templates/Challenges/components/Hotkeys.js b/client/src/templates/Challenges/components/Hotkeys.js
index ca49e156c6..e38902f14e 100644
--- a/client/src/templates/Challenges/components/Hotkeys.js
+++ b/client/src/templates/Challenges/components/Hotkeys.js
@@ -4,9 +4,9 @@ import { HotKeys, GlobalHotKeys } from 'react-hotkeys';
 import { navigate } from 'gatsby';
 
 const keyMap = {
-  EXECUTE_CHALLENGE: ['ctrl+enter', 'cmd+enter'],
-  NAVIGATE_PREV: ['ctrl+left', 'cmd+left'],
-  NAVIGATE_NEXT: ['ctrl+right', 'cmd+right']
+  EXECUTE_CHALLENGE: ['ctrl+enter'],
+  NAVIGATE_PREV: ['ctrl+left'],
+  NAVIGATE_NEXT: ['ctrl+right']
 };
 
 const propTypes = {