diff --git a/client/commonFramework.js b/client/commonFramework.js
index a2ee7b5ec3..df99ca90f0 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -421,6 +421,7 @@ var testSuccess = function() {
 function ctrlEnterClickHandler(e) {
   // ctrl + enter
   if (e.ctrlKey && e.keyCode === 13) {
+    $('#complete-courseware-dialog').off('keydown', ctrlEnterClickHandler);
     $('#submit-challenge').click();
   }
 }
@@ -441,17 +442,9 @@ function showCompletion() {
   var bonfireSolution = myCodeMirror.getValue();
   var didCompleteWith = $('#completed-with').val() || null;
 
-
   $('#complete-courseware-dialog').modal('show');
   $('#complete-courseware-dialog .modal-header').click();
 
-  $('#complete-courseware-dialog').keyup(function(e) {
-    // ctrl + enter
-    if (e.ctrlKey && e.keyCode === 13) {
-      $('#submit-challenge').click();
-    }
-  });
-
   $('#submit-challenge').click(function(e) {
     e.preventDefault();
 
@@ -785,12 +778,12 @@ $(document).ready(function() {
 
   // init modal keybindings on open
   $('#complete-courseware-dialog').on('shown.bs.modal', function() {
-    $('#complete-courseware-dialog').keyup(ctrlEnterClickHandler);
+    $('#complete-courseware-dialog').keydown(ctrlEnterClickHandler);
   });
 
   // remove modal keybinds on close
   $('#complete-courseware-dialog').on('hidden.bs.modal', function() {
-    $('#complete-courseware-dialog').unbind('keyup', ctrlEnterClickHandler);
+    $('#complete-courseware-dialog').off('keydown', ctrlEnterClickHandler);
   });
 
   var $preview = $('#preview');