diff --git a/interface.js b/interface.js
index aaa329af4..2344e1309 100644
--- a/interface.js
+++ b/interface.js
@@ -136,6 +136,7 @@ function newProblem(e, data) {
             .addClass("framework-" + framework);
 
     // Enable/disable the get hint button
+    $(".hint-box").toggle(numHints !== 0);
     updateHintButtonText();
     $("#hint").attr("disabled", hintsUsed >= numHints);
 }
diff --git a/khan-exercise.js b/khan-exercise.js
index 6060101ea..b150c70fa 100644
--- a/khan-exercise.js
+++ b/khan-exercise.js
@@ -1147,11 +1147,6 @@ var Khan = (function() {
         // Remove and store hints to delay running modules on it
         hints = problem.children(".hints").remove();
 
-        // Remove the hint box if there are no hints in the problem
-        if (hints.length === 0) {
-            $(".hint-box").remove();
-        }
-
         // Only show the calculator if it's specifically allowed for this problem
         if (problem.data("calculator") == null) {
             $("#calculator").hide();