diff --git a/client/src/templates/Challenges/classic/editor.tsx b/client/src/templates/Challenges/classic/editor.tsx
index c1082159de..9857c46523 100644
--- a/client/src/templates/Challenges/classic/editor.tsx
+++ b/client/src/templates/Challenges/classic/editor.tsx
@@ -311,7 +311,7 @@ const Editor = (props: PropTypes): JSX.Element => {
       /* eslint-disable no-bitwise */
       keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter],
       // TODO: Discuss with Ahmad what should pop-up when a challenge is completed
-      run: () => props.executeChallenge()
+      run: () => props.executeChallenge(true)
     });
     editor.addAction({
       id: 'leave-editor',
diff --git a/client/src/templates/Challenges/components/Tool-Panel.js b/client/src/templates/Challenges/components/Tool-Panel.js
index 02cb98664e..1c0581f539 100644
--- a/client/src/templates/Challenges/components/Tool-Panel.js
+++ b/client/src/templates/Challenges/components/Tool-Panel.js
@@ -44,6 +44,9 @@ function ToolPanel({
   guideUrl,
   videoUrl
 }) {
+  const handleRunTests = () => {
+    executeChallenge(true);
+  };
   const { t } = useTranslation();
   return (
     <Fragment>
@@ -52,7 +55,7 @@ function ToolPanel({
           isMobile ? 'tool-panel-group-mobile' : ''
         }`}
       >
-        <Button block={true} bsStyle='primary' onClick={executeChallenge}>
+        <Button block={true} bsStyle='primary' onClick={handleRunTests}>
           {isMobile ? t('buttons.run') : t('buttons.run-test')}
         </Button>
         <Button