diff --git a/grade/report/singleview/templates/grade_item_selector.mustache b/grade/report/singleview/templates/grade_item_selector.mustache
index da9fc322ad9..1963b3a7669 100644
--- a/grade/report/singleview/templates/grade_item_selector.mustache
+++ b/grade/report/singleview/templates/grade_item_selector.mustache
@@ -31,23 +31,23 @@
 }}
 <div class="search-widget dropdown d-flex" data-searchtype="grade">
     <button aria-expanded="false" data-toggle="dropdown" class="btn dropdown-toggle d-flex text-left align-items-center p-0" data-courseid="{{courseid}}" aria-label="{{#str}} selectagrade, gradereport_singleview {{/str}}">
-        <div class="align-items-center d-flex">
+        <span class="align-items-center d-flex">
             {{#selectedoption}}
-                <div class="d-block pr-3 text-truncate">
+                <span class="d-block pr-3 text-truncate">
                     <span class="d-block small">
                         {{#str}} selectagrade, gradereport_singleview {{/str}}
                     </span>
                     <span class="p-0 font-weight-bold">
                         {{text}}
                     </span>
-                </div>
+                </span>
             {{/selectedoption}}
             {{^selectedoption}}
-                <div class="user-info d-block pr-3">
+                <span class="user-info d-block pr-3">
                     {{#str}} selectagrade, gradereport_singleview {{/str}}
-                </div>
+                </span>
             {{/selectedoption}}
-        </div>
+        </span>
     </button>
     <div class="dropdown-menu wide">
     </div>
diff --git a/grade/templates/group_selector.mustache b/grade/templates/group_selector.mustache
index 987d1ef912e..6276eece6b8 100644
--- a/grade/templates/group_selector.mustache
+++ b/grade/templates/group_selector.mustache
@@ -35,16 +35,16 @@
 }}
 <div class="search-widget d-flex dropdown" data-searchtype="group">
     <button aria-expanded="false" data-toggle="dropdown" class="btn dropdown-toggle d-flex text-left align-items-center p-0" data-courseid="{{courseid}}" data-action-base-url="{{groupactionbaseurl}}">
-        <div class="align-items-center d-flex">
-            <div class="d-block pr-3">
+        <span class="align-items-center d-flex">
+            <span class="d-block pr-3">
                 <span class="d-block small">
                     {{label}}
                 </span>
                 <span class="p-0 font-weight-bold">
                     {{selectedgroup}}
                 </span>
-            </div>
-        </div>
+            </span>
+        </span>
     </button>
     <div class="dropdown-menu narrow">
     </div>
diff --git a/grade/templates/user_selector.mustache b/grade/templates/user_selector.mustache
index 20309d92cc4..a6eab8964c6 100644
--- a/grade/templates/user_selector.mustache
+++ b/grade/templates/user_selector.mustache
@@ -40,17 +40,17 @@
 }}
 <div class="search-widget dropdown d-flex" data-searchtype="user">
     <button aria-expanded="false" data-toggle="dropdown" class="btn dropdown-toggle d-flex text-left align-items-center p-0" data-courseid="{{courseid}}" data-groupid="{{groupid}}" aria-label="{{#str}} selectauser, core_grades {{/str}}">
-        <div class="align-items-center d-flex">
+        <span class="align-items-center d-flex">
             {{#selectedoption}}
-                <div class="selected-option-img d-block pr-2">
+                <span class="selected-option-img d-block pr-2">
                     {{#image}}
                         {{{image}}}
                     {{/image}}
                     {{^image}}
                         <span class="userinitials"></span>
                     {{/image}}
-                </div>
-                <div class="selected-option-info d-block pr-3 text-truncate">
+                </span>
+                <span class="selected-option-info d-block pr-3 text-truncate">
                     <span class="selected-option-text p-0 font-weight-bold">
                         {{text}}
                     </span>
@@ -59,17 +59,17 @@
                             {{additionaltext}}
                         </span>
                     {{/additionaltext}}
-                </div>
+                </span>
             {{/selectedoption}}
             {{^selectedoption}}
-                <div class="d-block pr-2">
+                <span class="d-block pr-2">
                     <span class="userinitials"></span>
-                </div>
-                <div class="user-info d-block pr-3">
+                </span>
+                <span class="user-info d-block pr-3">
                     {{#str}} selectauser, core_grades {{/str}}
-                </div>
+                </span>
             {{/selectedoption}}
-        </div>
+        </span>
     </button>
     <div class="dropdown-menu wide">
     </div>