diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index e07b6b979..bfa0558eb 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -124,7 +124,8 @@ $(function(){
         $('#textarea_input_test').focus();
     });
 
-    $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+
+    var saveProgramAnswers = function() {
         var test_numbers = 0;
         var valid = true;  
         var input = null;
@@ -159,6 +160,12 @@ $(function(){
             $('.program-input').remove();
             var html=bt('t:program-input-list',data);
             $("input[name=homework_type]").after(html);
+        }
+        return valid;
+    }
+
+    $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+        if(saveProgramAnswers()){
             if($( "#BluePopupBox" ).dialog( "isOpen" )){
                 $("#BluePopupBox").dialog( "close" );    
             }