diff --git a/client/commonFramework.js b/client/commonFramework.js
index 45589df873..3a6c8d911e 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -421,7 +421,8 @@ function showCompletion() {
   );
   var bonfireSolution = myCodeMirror.getValue();
   var didCompleteWith = $('#completed-with').val() || null;
-  $('#complete-courseware-dialog').modal('show').focus();
+  $('#complete-courseware-dialog').modal('show');
+  $('#complete-courseware-dialog .modal-header').click();
   $('#submit-challenge').click(function(e) {
     e.preventDefault();