diff --git a/lib/templates/action_link.mustache b/lib/templates/action_link.mustache
index 0616c6345cb2..03eb9ca8717a 100644
--- a/lib/templates/action_link.mustache
+++ b/lib/templates/action_link.mustache
@@ -52,11 +52,11 @@
     }
 }}
 {{^disabled}}
-    <a href="{{{url}}}" id="{{id}}" class="{{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</a>
+    <a href="{{{url}}}" id="{{id}}" class="dropdown-item {{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</a>
     {{#hasactions}}
         {{> core/actions }}
     {{/hasactions}}
 {{/disabled}}
 {{#disabled}}
-    <span class="currentlink {{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</span>
+    <span class="currentlink dropdown-item {{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</span>
 {{/disabled}}
diff --git a/lib/templates/action_menu_trigger.mustache b/lib/templates/action_menu_trigger.mustache
index 8a172c9dfad5..166c0fa61d5a 100644
--- a/lib/templates/action_menu_trigger.mustache
+++ b/lib/templates/action_menu_trigger.mustache
@@ -111,7 +111,7 @@
                 {{/actionmenufiller}}
                 {{^actionmenulink}}
                     {{^actionmenufiller}}
-                        <div class="dropdown-item">{{> core/action_menu_item }}</div>
+                        {{> core/action_menu_item }}
                     {{/actionmenufiller}}
                 {{/actionmenulink}}
             {{/items}}