diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
index 7f3430f216..441929a05f 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
+++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
@@ -6,7 +6,6 @@ class @DiscussionThreadView extends Backbone.View
   template: _.template($("#thread-template").html())
 
   render: ->
-    console.log(@model)
     @$el.html(@template(@model.toJSON()))
     @model.bind "change", @updateModelDetails
     if window.user.following(@model)
diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html
new file mode 100644
index 0000000000..4a8a78e0bb
--- /dev/null
+++ b/lms/templates/discussion/_thread_list_template.html
@@ -0,0 +1,26 @@
+<script type="text/template" id="thread-list-template">
+    <div class="browse-search">
+        <div class="browse is-open">
+            <a href="#" class="browse-topic-drop-icon"></a>
+            <a href="#" class="browse-topic-drop-btn"><span class="current-board">Homework / Week 1</span> <span class="drop-arrow">▾</span></a>
+        </div>
+        <%include file="_filter_dropdown.html" />
+        <div class="search">
+            <form class="post-search">
+                <input type="text" placeholder="Search all discussions" class="post-search-field">
+            </form>
+        </div>
+    </div>
+    <div class="sort-bar">
+        <span class="sort-label">Sort by:</span>
+        <ul>
+            <li><a href="#" class="active" data-sort="date">date</a></li>
+            <li><a href="#" data-sort="votes">votes</a></li>
+            <li><a href="#" data-sort="comments">comments</a></li>
+        </ul>
+    </div>
+    <div class="post-list-wrapper">
+        <ul class="post-list">
+        </ul>
+    </div>
+</script>
\ No newline at end of file
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 634d8167d9..1a28843271 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -1,30 +1,3 @@
-<script type="text/template" id="thread-list-template">
-    <div class="browse-search">
-        <div class="browse is-open">
-            <a href="#" class="browse-topic-drop-icon"></a>
-            <a href="#" class="browse-topic-drop-btn"><span class="current-board">Homework / Week 1</span> <span class="drop-arrow">▾</span></a>
-        </div>
-        <%include file="_filter_dropdown.html" />
-        <div class="search">
-            <form class="post-search">
-                <input type="text" placeholder="Search all discussions" class="post-search-field">
-            </form>
-        </div>
-    </div>
-    <div class="sort-bar">
-        <span class="sort-label">Sort by:</span>
-        <ul>
-            <li><a href="#" class="active" data-sort="date">date</a></li>
-            <li><a href="#" data-sort="votes">votes</a></li>
-            <li><a href="#" data-sort="comments">comments</a></li>
-        </ul>
-    </div>
-    <div class="post-list-wrapper">
-        <ul class="post-list">
-        </ul>
-    </div>
-</script>
-
 <script type="text/template" id="thread-template">
     <article class="discussion-article" data-id="${'<%- id %>'}">
         <a href="#" class="dogear"></a>
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index 182aacd82d..48ed88fdfb 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -30,4 +30,5 @@
     </div>
 </section>
 
-<%include file="_underscore_templates.html" />
\ No newline at end of file
+<%include file="_underscore_templates.html" />
+<%include file="_thread_list_template.html" />
\ No newline at end of file
diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html
index 507c24f6d6..b9bbc8365e 100644
--- a/lms/templates/discussion/single_thread.html
+++ b/lms/templates/discussion/single_thread.html
@@ -32,3 +32,4 @@
 </section>
 
 <%include file="_underscore_templates.html" />
+<%include file="_thread_list_template.html" />