diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index c041fa7084..88ca910ab9 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -18,24 +18,35 @@ $discussion_input_width: 60%;
 
 .course-content {
   .discussion {
-    margin-left: 40px;
-    margin-top: 15px;
+    margin-left: flex-gutter(4);
+    margin-top: flex-gutter(6);
   }
 }
 
 .discussion {
   .discussion-search-form {
-    margin-bottom: 40px;
-    .discussion-search {
+    margin-bottom: flex-gutter(4);
+    display: inline-block;
+    width: flex-grid(12);
+    .discussion-link {
+      display: inline-block;
+      margin-left: flex-gutter();
       @include discussion-font;
       color: #1d9dd9;
-      display: block;
-      margin-top: 10px;
-      font-weight: bold;
+      margin-top: flex-gutter();
+      font-weight: bold; 
     }
     .discussion-search-text {
       @include discussion-font;
     }
+    .search-input {
+      float: left;
+      width: flex-grid(6);
+    }
+    .search-within {
+      display: block;
+      margin-top: flex-gutter();
+    }
   }
   
   .discussion-title {
@@ -43,7 +54,7 @@ $discussion_input_width: 60%;
     @include discussion-clickable;
     font-size: $discussion_title_size;
     font-weight: bold;
-    margin-bottom: 20px;
+    margin-bottom: flex-gutter(6);
     display: block;
   }
   .discussion-title-wrapper {
@@ -66,7 +77,7 @@ $discussion_input_width: 60%;
     margin-right: 8px;
     margin-top: 5px;
     text-align: center;
-    height: 40px;
+    height: flex-grid(3);
     float: left;
     .discussion-vote-count {
       font-size: $comment_body_size;
diff --git a/lms/templates/discussion/search_bar.html b/lms/templates/discussion/search_bar.html
index 1da5fc9fdb..ef1ae2a2b8 100644
--- a/lms/templates/discussion/search_bar.html
+++ b/lms/templates/discussion/search_bar.html
@@ -6,8 +6,10 @@ def url_for_search():
 %>
 
 <form action="${url_for_search()}" method="get" class="discussion-search-form">
-  <input class="searchInput" type="text" value="${text}" id="keywords" autocomplete="off"/>
-  <a class="discussion-link discussion-search" href="javascript:void(0)">Search</a>
-  <input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
-  <label for="discussion-search-within-board-${discussion_id}">Search within board</label>
+  <input class="search-input" type="text" value="${text}" id="keywords" autocomplete="off"/>
+  <a class="discussion-link" href="javascript:void(0)">Search</a>
+  <div class="search-within">
+    <input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
+    <label for="discussion-search-within-board-${discussion_id}">Search within board</label>
+  </div>
 </form>