diff --git a/client/commonFramework.js b/client/commonFramework.js
index 39a40923b9..f1aaa768aa 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -659,7 +659,11 @@ function ctrlEnterClickHandler(e) {
   // ctrl + enter
   if (e.ctrlKey && e.keyCode === 13) {
     $('#complete-courseware-dialog').off('keydown', ctrlEnterClickHandler);
-    $('#submit-challenge').click();
+    if ($('#submit-challenge').length > 0) {
+      $('#submit-challenge').click();
+    } else {
+      window.location = '/challenges/next-challenge?id=' + common.challengeId;
+    }
   }
 }
 
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 92432a3bf4..5a2f6c0a11 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -108,7 +108,7 @@ block content
                                   i.fa.fa-twitter  
                                       = phrase
                       else
-                          a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
+                          #next-challenge.btn.btn-lg.btn-primary.btn-block Go to my next challenge (ctrl + enter)
     #reset-modal.modal(tabindex='-1')
         .modal-dialog.animated.fadeInUp.fast-animation
             .modal-content
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index ad2213e803..d07dd7748d 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -98,7 +98,7 @@ block content
                             if(user)
                                 #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
                             else
-                                a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
+                                #next-challenge.btn.btn-lg.btn-primary.btn-block Go to my next challenge (ctrl + enter)
     include ../partials/challenge-modals
     script.
       document.addEventListener('gitter-sidecar-ready', function(e) {
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index 887e44c964..4cfe47bf96 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -95,7 +95,7 @@ block content
                         if (user)
                             #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
                         else
-                            a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
+                            #next-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Go to my next challenge (ctrl + enter)
     include ../partials/challenge-modals
     script.
       var MDNlinks = !{JSON.stringify(MDNlinks)};