diff --git a/web/styles/settings.css b/web/styles/settings.css
index d90240623a..8c9b1a5fe5 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -415,6 +415,26 @@ input[type="checkbox"] {
     }
 }
 
+.decorated-stream-name-dropdown-widget {
+    .dropdown_widget_value {
+        /* The max-width should account for the
+           16px-square box (at 16px/1em) for the
+           chevron icon. */
+        max-width: calc(100% - 1em);
+        display: flex;
+        align-items: baseline;
+        /* Mimic the space from the previous inline
+           layout. */
+        gap: 0.4ch;
+    }
+
+    .decorated-channel-name {
+        overflow-x: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
 .allow-subdomains,
 .new-realm-domain-allow-subdomains {
     margin: 0 !important;
@@ -842,24 +862,6 @@ input[type="checkbox"] {
 #organization-settings {
     .dropdown-widget-button {
         color: hsl(0deg 0% 33%);
-
-        .dropdown_widget_value {
-            /* The max-width should account for the
-               16px-square box (at 16px/1em) for the
-               chevron icon. */
-            max-width: calc(100% - 1em);
-            display: flex;
-            align-items: baseline;
-            /* Mimic the space from the previous inline
-               layout. */
-            gap: 0.4ch;
-        }
-
-        .decorated-channel-name {
-            overflow-x: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
     }
 }
 
diff --git a/web/templates/dropdown_widget.hbs b/web/templates/dropdown_widget.hbs
index d01ca1867a..6afe001b68 100644
--- a/web/templates/dropdown_widget.hbs
+++ b/web/templates/dropdown_widget.hbs
@@ -1,4 +1,4 @@
-<button id="{{widget_name}}_widget" class="dropdown-widget-button" type="button" {{#if is_setting_disabled}}disabled{{/if}} {{#if disable_keyboard_focus}}tabindex="-1"{{/if}} name="{{widget_name}}">
+<button id="{{widget_name}}_widget" class="dropdown-widget-button {{#if custom_classes}}{{custom_classes}}{{/if}}" type="button" {{#if is_setting_disabled}}disabled{{/if}} {{#if disable_keyboard_focus}}tabindex="-1"{{/if}} name="{{widget_name}}">
     <span class="dropdown_widget_value">{{#if default_text}}{{default_text}}{{/if}}</span>
     <i class="zulip-icon zulip-icon-chevron-down"></i>
 </button>
diff --git a/web/templates/settings/organization_settings_admin.hbs b/web/templates/settings/organization_settings_admin.hbs
index c3a1cecf1b..dd4838717a 100644
--- a/web/templates/settings/organization_settings_admin.hbs
+++ b/web/templates/settings/organization_settings_admin.hbs
@@ -19,17 +19,20 @@
                 {{> ../dropdown_widget_with_label
                   widget_name="realm_new_stream_announcements_stream_id"
                   label=admin_settings_label.realm_new_stream_announcements_stream
-                  value_type="number"}}
+                  value_type="number"
+                  custom_classes="decorated-stream-name-dropdown-widget"}}
 
                 {{> ../dropdown_widget_with_label
                   widget_name="realm_signup_announcements_stream_id"
                   label=admin_settings_label.realm_signup_announcements_stream
-                  value_type="number"}}
+                  value_type="number"
+                  custom_classes="decorated-stream-name-dropdown-widget"}}
 
                 {{> ../dropdown_widget_with_label
                   widget_name="realm_zulip_update_announcements_stream_id"
                   label=admin_settings_label.realm_zulip_update_announcements_stream
-                  value_type="number"}}
+                  value_type="number"
+                  custom_classes="decorated-stream-name-dropdown-widget"}}
 
                 {{> settings_checkbox
                   setting_name="realm_message_content_allowed_in_email_notifications"