diff --git a/lms/templates/course_navigation.html b/lms/templates/course_navigation.html
index f6903d42b6..adb288881d 100644
--- a/lms/templates/course_navigation.html
+++ b/lms/templates/course_navigation.html
@@ -15,13 +15,16 @@ def url_class(url):
       <li class="courseware"><a href="${reverse('courseware', args=[course.id])}" class="${url_class('courseware')}">Courseware</a></li>
       <li class="info"><a href="${reverse('info', args=[course.id])}" class="${url_class('info')}">Course Info</a></li>
 % if user.is_authenticated():
-% if settings.MITX_FEATURES.get('ENABLE_TEXTBOOK'):
-      <li class="book"><a href="${reverse('book', args=[course.id])}" class="${url_class('book')}">Textbook</a></li>
-% endif
-% if settings.MITX_FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
-      <li class="discussion"><a href="${reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id])}" class="${url_class('discussion')}">Discussion</a></li>
-      <li class="news"><a href="${reverse('news', args=[course.id])}" class="${url_class('news')}">News</a></li>
-% endif 
+  % if settings.MITX_FEATURES.get('ENABLE_TEXTBOOK'):
+        <li class="book"><a href="${reverse('book', args=[course.id])}" class="${url_class('book')}">Textbook</a></li>
+  % endif
+  % if settings.MITX_FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
+        <li class="discussion"><a href="${reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id])}" class="${url_class('discussion')}">Discussion</a></li>
+        <li class="news"><a href="${reverse('news', args=[course.id])}" class="${url_class('news')}">News</a></li>
+  % endif 
+  % if settings.MITX_FEATURES.get('ENABLE_DISCUSSION'):
+        <li class="discussion"><a href="${reverse('questions')}">Discussion</a></li>
+  % endif
 % endif
 % if settings.WIKI_ENABLED:
       <li class="wiki"><a href="${reverse('wiki_root', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>