diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index e7084d315b..e976b75828 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -303,6 +303,7 @@ class @CombinedOpenEnded
     @reset_button.hide()
     @next_problem_button.hide()
     @hide_file_upload()
+    @legend_container.show()
     @hint_area.attr('disabled', false)
     if @task_number>1 or @child_state!='initial'
       @show_status_current()
@@ -325,6 +326,7 @@ class @CombinedOpenEnded
       @submit_button.prop('value', 'Submit')
       @submit_button.click @save_answer
       @setup_file_upload()
+      @legend_container.hide()
     else if @child_state == 'assessing'
       @answer_area.attr("disabled", true)
       @replace_text_inputs()
diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html
index 5d8ef859aa..0dc5ec914f 100644
--- a/lms/templates/combinedopenended/combined_open_ended.html
+++ b/lms/templates/combinedopenended/combined_open_ended.html
@@ -1,8 +1,8 @@
 <section id="combined-open-ended" class="combined-open-ended" data-location="${location}" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
+    <h2>${display_name}</h2>
     <div class="status-container">
         ${status|n}
     </div>
-    <h2>${display_name}</h2>
 
     <div class="item-container">
         <h4>Prompt <a href="#" class="question-header">(Hide)</a> </h4>