diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index 315302fd7a..112ce928a0 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -74,17 +74,18 @@ ${HTML(fragment.foot_html())}
${HTML(fragment.body_html())}
+% if course.show_calculator or is_edxnotes_enabled(course):
+
+% endif
<%include file="../modal/accessible_confirm.html" />
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 11bebbce7f..37363b3681 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -207,17 +207,17 @@ ${HTML(fragment.foot_html())}
% endif
+% if course.show_calculator or is_edxnotes_enabled(course):
+
+ ## Utility: Notes
+ % if is_edxnotes_enabled(course):
+ <%include file="/edxnotes/toggle_notes.html" args="course=course"/>
+ % endif
-
- ## Utility: Notes
- % if is_edxnotes_enabled(course):
- <%include file="/edxnotes/toggle_notes.html" args="course=course"/>
- % endif
-
- ## Utility: Calc
- % if course.show_calculator:
- <%include file="/calculator/toggle_calculator.html" />
- % endif
-
-
+ ## Utility: Calc
+ % if course.show_calculator:
+ <%include file="/calculator/toggle_calculator.html" />
+ % endif
+
+% endif
<%include file="../modal/accessible_confirm.html" />