diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index b18d389b1b..312041d6ba 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -43,10 +43,12 @@ def render_discussion(request, course_id, threads, discussion_id=None, \
         'forum': 'discussion/_forum.html',
     }[discussion_type]
 
-    base_url = {
+    """base_url = {
         'inline': (lambda: reverse('django_comment_client.forum.views.inline_discussion', args=[course_id, discussion_id])), 
         'forum': (lambda: reverse('django_comment_client.forum.views.forum_form_discussion', args=[course_id, discussion_id])),
-    }[discussion_type]()
+    }[discussion_type]()"""
+
+    base_url = reverse('django_comment_client.forum.views.inline_discussion', args=[course_id, discussion_id])
 
     annotated_content_info = {thread['id']: get_annotated_content_info(thread, request.user.id) for thread in threads}
 
@@ -69,7 +71,7 @@ def render_inline_discussion(*args, **kwargs):
     return render_discussion(discussion_type='inline', *args, **kwargs)
 
 def render_forum_discussion(*args, **kwargs):
-    return render_discussion(discussion_type='inline', *args, **kwargs) # make everything inline for now
+    return render_discussion(discussion_type='forum', *args, **kwargs)
 
 def get_threads(request, course_id, discussion_id):
     query_params = {
diff --git a/lms/templates/discussion/_forum.html b/lms/templates/discussion/_forum.html
index ba0567c076..87609f92b9 100644
--- a/lms/templates/discussion/_forum.html
+++ b/lms/templates/discussion/_forum.html
@@ -13,8 +13,8 @@
       <label for="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board">Search within board</label>
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
+    <%include file="_sort.html" />
   </div>
-  <%include file="_sort.html" />
   <div class="threads">
     % for thread in threads:
       ${renderer.render_thread(course_id, thread, show_comments=False)}
diff --git a/lms/templates/discussion/_paginator.html b/lms/templates/discussion/_paginator.html
index 7bf0dc789d..82d593273e 100644
--- a/lms/templates/discussion/_paginator.html
+++ b/lms/templates/discussion/_paginator.html
@@ -9,11 +9,7 @@
 %>
 
 <%def name="link_to_page(_page, text)">
-  % if discussion_type == 'inline':
-    <a class="discussion-page-link discussion-inline-page-link" href="javascript:void(0)" page-url="${url_for_page(_page)}">${text}</a>
-  % else:
-    <a class="discussion-page-link" href="${url_for_page(_page)}">${text}</a>
-  % endif
+  <a class="discussion-page-link discussion-inline-page-link" href="javascript:void(0)" page-url="${url_for_page(_page)}">${text}</a>
 </%def>
 
 <%def name="div_page(_page)">
diff --git a/lms/templates/discussion/_sort.html b/lms/templates/discussion/_sort.html
index aa8e21b807..96f2bb93b9 100644
--- a/lms/templates/discussion/_sort.html
+++ b/lms/templates/discussion/_sort.html
@@ -20,11 +20,7 @@
   def url_for_sort(key, order):
     return base_url + '?' + urlencode(merge(query_params, {'page': 1, 'sort_key': key, 'sort_order': order}))
   %>
-  % if discussion_type == 'inline':
-    <a class="discussion-sort-link discussion-inline-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
-  % else:
-    <a class="discussion-sort-link ${cls}" href="${url_for_sort(key, order)}">${title}</a>
-  % endif
+  <a class="discussion-sort-link discussion-inline-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
 </%def>
     
 <div class="discussion-sort">