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 d0dce5343f..78d9fd11bf 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
@@ -204,6 +204,7 @@ class @PeerGradingProblem
     @calibration_feedback_button = $('.calibration-feedback-button')
     @interstitial_page_button = $('.interstitial-page-button')
     @flag_student_checkbox = $('.flag-checkbox')
+    @collapse_question()
 
     Collapsible.setCollapsibles(@content_panel)
 
@@ -270,7 +271,6 @@ class @PeerGradingProblem
        if response.calibrated and (@calibration == null or @calibration == false)
          @calibration = false
          @fetch_submission_essay()
-         @collapse_question()
       # If we were calibrating before and no longer need to,
       # show the interstitial page
        else if response.calibrated and @calibration == true
diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index f816f74931..1ea51258c6 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -183,6 +183,7 @@ class @StaffGrading
 
     @question_header = $('.question-header')
     @question_header.click @collapse_question
+    @collapse_question()
     
     # model state
     @state = state_no_data
@@ -292,7 +293,6 @@ class @StaffGrading
     @min_for_ml = response.min_for_ml
     @num_pending = response.num_pending
     @state = state_grading
-    @collapse_question
     if not @max_score?
       @error("No max score specified for submission.")