diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
index 0cbccad548..8771b4fe91 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
@@ -257,8 +257,6 @@ class @PeerGradingProblem
     $(window).keydown @keydown_handler
     $(window).keyup @keyup_handler
 
-    @collapse_question()
-
     Collapsible.setCollapsibles(@content_panel)
 
     # Set up the click event handlers
@@ -571,16 +569,17 @@ class @PeerGradingProblem
     @grading_message.fadeIn()
     @grading_message.html("<p>" + msg + "</p>")
 
-  collapse_question: () =>
+  collapse_question: (event) =>
     @prompt_container.slideToggle()
     @prompt_container.toggleClass('open')
-    if @question_header.text() == "(Hide)"
-      Logger.log 'peer_grading_hide_question', {location: @location}
-      new_text = "(Show)"
+    if @question_header.text() == "Hide Prompt"
+      new_text = "Show Prompt"
+      Logger.log 'oe_hide_question', {location: @location}
     else
-      Logger.log 'peer_grading_show_question', {location: @location}
-      new_text = "(Hide)"
+      Logger.log 'oe_show_question', {location: @location}
+      new_text = "Hide Prompt"
     @question_header.text(new_text)
+    return false
 
   scroll_to_top: () =>
     $('html, body').animate({
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index b945e030cb..80b230e2aa 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.html
@@ -14,10 +14,10 @@
             </div>
 
             <div class="prompt-wrapper">
-                <div class="visibility-control visibility-control-rubric">
+                <div class="visibility-control visibility-control-prompt">
                     <div class="inner">
                     </div>
-                    <span class="section-header section-header-rubric">${_('Hide Prompt')}</span>
+                    <a href="" class="section-header section-header-prompt question-header">${_('Hide Prompt')}</a>
                 </div>
                 <div class="prompt-information-container">
                     <section>