diff --git a/common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee
index c3bb52fe41..989893d64e 100644
--- a/common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee
+++ b/common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee
@@ -205,7 +205,7 @@ describe "DiscussionUserProfileView", ->
                     )
                     {always: ->}
             )
-            @view.$(".pagination a").first().click()
+            @view.$(".discussion-pagination a").first().click()
             expect(@view.$(".current-page").text()).toEqual("42")
             expect(@view.$(".last-page").text()).toEqual("99")
 
@@ -216,5 +216,5 @@ describe "DiscussionUserProfileView", ->
                     params.error()
                     {always: ->}
             )
-            @view.$(".pagination a").first().click()
+            @view.$(".discussion-pagination a").first().click()
             expect(DiscussionUtil.discussionAlert).toHaveBeenCalled()
diff --git a/common/static/coffee/src/discussion/discussion_module_view.coffee b/common/static/coffee/src/discussion/discussion_module_view.coffee
index 0fd883d6c7..198d48d34c 100644
--- a/common/static/coffee/src/discussion/discussion_module_view.coffee
+++ b/common/static/coffee/src/discussion/discussion_module_view.coffee
@@ -155,7 +155,7 @@ if Backbone?
         "?discussion_page=#{number}"
       params = DiscussionUtil.getPaginationParams(@page, numPages, pageUrl)
       pagination = _.template($("#pagination-template").html())(params)
-      @$('section.pagination').html(pagination)
+      @$('section.discussion-pagination').html(pagination)
 
     navigateToPage: (event) =>
       event.preventDefault()
diff --git a/common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee b/common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee
index 77cfd7df4f..6b03fca327 100644
--- a/common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee
@@ -18,7 +18,7 @@ if Backbone?
       baseUri = URI(window.location).removeSearch("page")
       pageUrlFunc = (page) -> baseUri.clone().addSearch("page", page)
       paginationParams = DiscussionUtil.getPaginationParams(@page, @numPages, pageUrlFunc)
-      @$el.find(".pagination").html(_.template($("#pagination-template").html())(paginationParams))
+      @$el.find(".discussion-pagination").html(_.template($("#pagination-template").html())(paginationParams))
 
     changePage: (event) ->
       event.preventDefault()
diff --git a/common/static/common/templates/discussion/inline-discussion.underscore b/common/static/common/templates/discussion/inline-discussion.underscore
index 42f7f2f2f2..96dde1bed8 100644
--- a/common/static/common/templates/discussion/inline-discussion.underscore
+++ b/common/static/common/templates/discussion/inline-discussion.underscore
@@ -8,6 +8,6 @@
         <% }); %>
     </section>
 
-    <section class="pagination">
+    <section class="discussion-pagination">
     </section>
 </section>
diff --git a/common/static/common/templates/discussion/user-profile.underscore b/common/static/common/templates/discussion/user-profile.underscore
index 0eeda55723..b4e683ae72 100644
--- a/common/static/common/templates/discussion/user-profile.underscore
+++ b/common/static/common/templates/discussion/user-profile.underscore
@@ -4,4 +4,4 @@
         <article class="discussion-thread" id="thread_<%= thread.id %>"/>
     <% }); %>
 </section>
-<section class="pagination"/>
+<section class="discussion-pagination"/>
diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss
index 7425a41618..09181d0012 100644
--- a/lms/static/sass/discussion/_discussion.scss
+++ b/lms/static/sass/discussion/_discussion.scss
@@ -753,10 +753,10 @@ body.discussion {
   }
 
   section.discussion {
-    margin-top: ($baseline*1.5);
+    clear: both;
+    padding-top: $baseline;
 
     .threads {
-      margin-top: $baseline;
     }
 
     .discussion-thread {
@@ -936,7 +936,7 @@ body.discussion {
     color: $white;
   }
 
-  section.pagination {
+  section.discussion-pagination {
     margin-top: ($baseline*1.5);
 
     nav.discussion-paginator {