diff --git a/lms/templates/course_groups/cohort_management.html b/lms/templates/course_groups/cohort_management.html
index 579d6fa48d..239863beeb 100644
--- a/lms/templates/course_groups/cohort_management.html
+++ b/lms/templates/course_groups/cohort_management.html
@@ -1,7 +1,7 @@
 <section class="cohort_manager" data-ajax_url="${cohorts_ajax_url}">
 <h3>Cohort groups</h3>
 
-<div class="controls">
+<div class="controls" style="padding-top:15px">
   <a href="#" class="button show_cohorts">Show cohorts</a>
 </div>
 
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index e9b9ae0354..7b177c6b6c 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -285,7 +285,9 @@ function goto( mode)
     </p>
     <hr width="40%" style="align:left">
 
+    %if course.is_cohorted:
     <%include file="/course_groups/cohort_management.html" />
+    %endif
 
   %endif
 %endif