diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 8e90e50f5ca..9c6845c5ef2 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -2102,12 +2102,6 @@ img#persona_signin {
                 color: @dropdownLinkColorHover;
                 background-color: @dropdownLinkBackgroundHover;
             }
-            &:first-child {
-                .border-top-radius(4px);
-            }
-            &:last-child {
-                .border-bottom-radius(4px);
-            }
         }
         a.hidden {
             display: none;
@@ -2122,6 +2116,12 @@ img#persona_signin {
         }
         > li {
             display: block;
+            &:first-child a {
+                .border-top-radius(4px);
+            }
+            &:last-child a {
+                .border-bottom-radius(4px);
+            }
         }
 
         /** bottom left of button **/
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 4787ee48e83..880a3a97b9c 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -4534,22 +4534,6 @@ img#persona_signin {
   color: #fff;
   background-color: #0070a8;
 }
-.moodle-actionmenu[data-enhanced].show .menu a:first-child {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-}
-.moodle-actionmenu[data-enhanced].show .menu a:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
 .moodle-actionmenu[data-enhanced].show .menu a.hidden {
   display: none;
 }
@@ -4564,6 +4548,22 @@ img#persona_signin {
 .moodle-actionmenu[data-enhanced].show .menu > li {
   display: block;
 }
+.moodle-actionmenu[data-enhanced].show .menu > li:first-child a {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+}
+.moodle-actionmenu[data-enhanced].show .menu > li:last-child a {
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
 .moodle-actionmenu[data-enhanced].show .menu.align-tl-bl {
   top: 100%;
   left: 0;