diff --git a/web/templates/dropdown_list.hbs b/web/templates/dropdown_list.hbs
index dd7395f341..d0c46660a3 100644
--- a/web/templates/dropdown_list.hbs
+++ b/web/templates/dropdown_list.hbs
@@ -44,21 +44,23 @@
                 {{!-- This is the option for PresetUrlOption.MAPPING --}}
                 <i class="zulip-icon zulip-icon-equal channel-privacy-type-icon" aria-hidden="true"></i> <span class="dropdown-list-text-selected">{{name}}</span>
             {{else}}
-                {{#if bold_current_selection}}
-                    <span class="dropdown-list-text-selected">{{name}}</span>
-                {{else}}
-                    <span class="dropdown-list-text-neutral">{{name}}</span>
-                {{/if}}
-                {{# if (or has_edit_icon has_delete_icon)}}
-                <span class="dropdown-list-buttons">
-                    {{#if has_edit_icon}}
-                        {{> components/icon_button custom_classes="dropdown-list-edit dropdown-list-control-button" intent="neutral" icon="edit" aria-label=(t "Edit folder") }}
+                <span class="dropdown-list-item-name">
+                    {{#if bold_current_selection}}
+                        <span class="dropdown-list-text-selected">{{name}}</span>
+                    {{else}}
+                        <span class="dropdown-list-text-neutral">{{name}}</span>
                     {{/if}}
-                    {{#if has_delete_icon}}
-                        {{> components/icon_button custom_classes="dropdown-list-delete dropdown-list-control-button" intent="danger" icon="trash" aria-label=(t "Delete folder") }}
+                    {{# if (or has_edit_icon has_delete_icon)}}
+                    <span class="dropdown-list-buttons">
+                        {{#if has_edit_icon}}
+                            {{> components/icon_button custom_classes="dropdown-list-edit dropdown-list-control-button" intent="neutral" icon="edit" aria-label=(t "Edit folder") }}
+                        {{/if}}
+                        {{#if has_delete_icon}}
+                            {{> components/icon_button custom_classes="dropdown-list-delete dropdown-list-control-button" intent="danger" icon="trash" aria-label=(t "Delete folder") }}
+                        {{/if}}
+                    </span>
                     {{/if}}
                 </span>
-                {{/if}}
             {{/if}}
         </a>
         {{/if}}