diff --git a/lms/static/js/fixtures/dashboard/dashboard.html b/lms/static/js/fixtures/dashboard/dashboard.html
index b83627523d..0f0bdc4c62 100644
--- a/lms/static/js/fixtures/dashboard/dashboard.html
+++ b/lms/static/js/fixtures/dashboard/dashboard.html
@@ -53,13 +53,13 @@
                 <div class="wrapper-course-actions">
                     <div class="course-actions">
                         <div class="wrapper-action-more" data-course-key="course-v1:DelftX+CTB3365DWx+1T2016">
-                            <button type='button'class="action action-more" id="actions-dropdown-link-1" aria-haspopup="true" aria-expanded="false" data-course-number="CTB3365DWx" data-course-name="Introduction to Drinking Water Treatment" data-dashboard-index="1">
+                            <button type='button'class="action action-more" id="actions-dropdown-link-1" aria-haspopup="true" aria-expanded="false" aria-controls="actions-dropdown-1" data-course-number="CTB3365DWx" data-course-name="Introduction to Drinking Water Treatment" data-dashboard-index="1">
                                 <span class="sr">
                                 Course options for Introduction to Drinking Water Treatment
                                 </span>
                                 <i class="fa fa-cog" aria-hidden="true"></i>
                             </button>
-                            <div class="actions-dropdown" id="actions-dropdown-1" aria-label="Additional Actions Menu">
+                            <div class="actions-dropdown" id="actions-dropdown-1" tabindex="-1">
                                 <ul class="actions-dropdown-list" id="actions-dropdown-list-1" aria-label="Available Actions" role="menu">
                                     <li class="actions-item" id="actions-item-unenroll-1">
                                         <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="course-v1:DelftX+CTB3365DWx+1T2016" data-course-number="CTB3365DWx" data-course-name="Introduction to Drinking Water Treatment" data-dashboard-index="1" data-track-info="Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?" id="unenroll-1">Unenroll</a>
@@ -143,13 +143,13 @@
                 <div class="wrapper-course-actions">
                     <div class="course-actions">
                         <div class="wrapper-action-more" data-course-key="course-v1:DelftX+CTB3365DWx+1T2016">
-                            <button type='button'class="action action-more" id="actions-dropdown-link-2" aria-haspopup="true" aria-expanded="false" data-course-number="CTB3365DWx" data-course-name="Introduction to Drinking Water Treatment" data-dashboard-index="2">
+                            <button type='button'class="action action-more" id="actions-dropdown-link-2" aria-haspopup="true" aria-expanded="false" aria-controls="actions-dropdown-2" data-course-number="CTB3365DWx" data-course-name="Introduction to Drinking Water Treatment" data-dashboard-index="2">
                                 <span class="sr">
                                 Course options for Introduction to Drinking Water Treatment
                                 </span>
                                 <i class="fa fa-cog" aria-hidden="true"></i>
                             </button>
-                            <div class="actions-dropdown" id="actions-dropdown-2" aria-label="Additional Actions Menu">
+                            <div class="actions-dropdown" id="actions-dropdown-2" tabindex="-1">
                                 <ul class="actions-dropdown-list" id="actions-dropdown-list-2" aria-label="Available Actions" role="menu">
                                     <li class="actions-item" id="actions-item-unenroll-2">
                                         <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="course-v1:DelftX+CTB3365DWx+1T2016" data-course-number="CTB3365DWx" data-course-name="Introduction to Drinking Water Treatment" data-dashboard-index="2" data-track-info="Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?" id="unenroll-2">Unenroll</a>
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index 24b62833c8..b17592f35a 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -178,14 +178,14 @@ from student.helpers import (
               % endif
             % endif
             <div class="wrapper-action-more" data-course-key="${enrollment.course_id}">
-              <button type="button" class="action action-more" id="actions-dropdown-link-${dashboard_index}" aria-haspopup="true" aria-expanded="false" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}">
+              <button type="button" class="action action-more" id="actions-dropdown-link-${dashboard_index}" aria-haspopup="true" aria-expanded="false" aria-controls="actions-dropdown-${dashboard_index}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}">
                 <span class="sr">${_('Course options for')}</span>
                 <span class="sr">&nbsp;
                   ${course_overview.display_name_with_default_escaped}
                 </span>
                 <i class="fa fa-cog" aria-hidden="true"></i>
               </button>
-              <div class="actions-dropdown" id="actions-dropdown-${dashboard_index}" aria-label="${_('Additional Actions Menu')}" tabindex="-1">
+              <div class="actions-dropdown" id="actions-dropdown-${dashboard_index}" tabindex="-1">
                 <ul class="actions-dropdown-list" id="actions-dropdown-list-${dashboard_index}" aria-label="${_('Available Actions')}" role="menu">
                   % if can_unenroll:
                     <li class="actions-item" id="actions-item-unenroll-${dashboard_index}">