diff --git a/client/commonFramework.js b/client/commonFramework.js
index 2562410c0c..430473a9d2 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -244,6 +244,7 @@ editor.setOption('extraKeys', {
     }
   },
   'Ctrl-Enter': function() {
+    isInitRun = false;
     bonfireExecute(true);
     return false;
   }
@@ -415,9 +416,6 @@ var testSuccess = function() {
   if (goodTests === tests.length) {
     return showCompletion();
   }
-
-  // test unsuccessful, make sure initRun is set to false
-  isInitRun = false;
 };
 
 function showCompletion() {
@@ -762,6 +760,7 @@ function bonfireExecute(shouldTest) {
 }
 
 $('#submitButton').on('click', function() {
+  isInitRun = false;
   bonfireExecute(true);
 });