diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index ff06e6a850..f6ad7eb22a 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -54,10 +54,10 @@ class @CombinedOpenEnded
     @submit_button.show()
     @reset_button.hide()
     @next_problem_button.hide()
-    @skip_button.hide()
     @hint_area.attr('disabled', false)
     if @child_type=="openended"
       @reload_button.hide()
+      @skip_button.hide()
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
@@ -73,6 +73,7 @@ class @CombinedOpenEnded
       if @child_type=="openended"
         @reload_button.hide()
         @skip_button.show()
+        @skip_post_assessment()
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
       if @child_type=="selfassessment"
@@ -83,7 +84,8 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
-      @skip_button.hide()
+      if @child_type=="openended"
+        @skip_button.hide()
       if @task_number<@task_count
         @next_problem()
       else
@@ -149,8 +151,7 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-  skip_post_assessment: (event) =>
-    event.preventDefault()
+  skip_post_assessment: =>
     if @child_state == 'post_assessment'
 
       $.postWithPrefix "#{@ajax_url}/skip_post_assessment", {}, (response) =>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 41ec403c47..7bc66d954f 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -3,7 +3,7 @@
     <div class="statusitem">
         Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
         %if status['type']=="openended":
-            <div class="collapsible open-ended-short-feedback">
+            <div class="collapsible external-grader-message">
                 <header>
                     <a href="#">Show feedback from step ${status['task_number']}</a>
                 </header>
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index e995d62cb1..9ade05d0e2 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -32,27 +32,6 @@
 
   <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
-      ${msg|n}
-    % if state == 'post_assessment':
-    <div class="collapsible evaluation-response">
-      <header>
-      <a href="#">Respond to Feedback</a>
-      </header>
-    <section id="evaluation_${id}" class="evaluation">
-    <p>How accurate do you find this feedback?</p>
-        <div class="evaluation-scoring">
-            <ul class="scoring-list">
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
-            </ul>
-        </div>
-        <p>Additional comments:</p>
-        <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
-    </section>
-    </div>
-    % endif
+     ${msg|n}
   </div>
 </section>
diff --git a/lms/templates/open_ended_evaluation.html b/lms/templates/open_ended_evaluation.html
new file mode 100644
index 0000000000..018486a1d6
--- /dev/null
+++ b/lms/templates/open_ended_evaluation.html
@@ -0,0 +1,22 @@
+<div class="external-grader-message">
+    ${msg|n}
+    <div class="collapsible evaluation-response">
+        <header>
+            <a href="#">Respond to Feedback</a>
+        </header>
+        <section id="evaluation_${id}" class="evaluation">
+            <p>How accurate do you find this feedback?</p>
+            <div class="evaluation-scoring">
+                <ul class="scoring-list">
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
+                </ul>
+            </div>
+            <p>Additional comments:</p>
+            <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
+        </section>
+    </div>
+</div>
\ No newline at end of file