diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 4a9a191998..d4210883c5 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -350,7 +350,7 @@ def index(request, course_id, chapter=None, section=None,
             if section_descriptor.chrome:
                 chrome = [s.strip() for s in section_descriptor.chrome.lower().split(",")]
                 if 'accordion' not in chrome:
-                    del context['accordion']
+                    context['disable_accordion'] = True
                 if 'tabs' not in chrome:
                     context['disable_tabs'] = True
 
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index e0b386f075..8098483536 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -179,7 +179,7 @@ ${fragment.foot_html()}
 </div>
 % endif
 
-  <%include file="/dashboard/_dashboard_prompt_midcourse_reverify.html" />
+<%include file="/dashboard/_dashboard_prompt_midcourse_reverify.html" />
 % if default_tab:
   <%include file="/courseware/course_navigation.html" />
 % else:
@@ -189,7 +189,7 @@ ${fragment.foot_html()}
 <div class="container">
   <div class="course-wrapper">
 
-% if accordion:
+% if not disable_accordion:
     <div class="course-index" role="navigation">
       <header id="open_close_accordion">
         <a href="#">${_("close")}</a>