diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor.css b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor.css
index f0d8667..2f06ea9 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor.css
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor.css
@@ -38,6 +38,14 @@
     margin-left: auto;
 }
 
+::deep .ec-toolbar-changes-link {
+    cursor: pointer;
+}
+
+::deep .ec-toolbar-changes-link:hover {
+    text-decoration: underline;
+}
+
 .ec-sections {
     display: flex;
     flex-direction: column;
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigToolbar.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigToolbar.razor
index bc7278a..41934fb 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigToolbar.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigToolbar.razor
@@ -22,7 +22,13 @@
             </button>
             @if (PendingChangesCount > 0)
             {
-                <span class="text-muted small">@PendingChangesCount change(s)</span>
+                <span class="text-muted small ec-toolbar-changes-link" role="button" tabindex="0"
+                      @onclick="OnOpenSaveModal"
+                      @onkeydown="OnChangesLinkKeyDown"
+                      title="Open save dialog"
+                      aria-label="Open save dialog">
+                    @PendingChangesCount change(s)
+                </span>
             }
         }
         else
@@ -59,4 +65,12 @@
     {
         await SearchTermChanged.InvokeAsync(e.Value?.ToString() ?? "");
     }
+
+    private async Task OnChangesLinkKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == "Enter" || e.Key == " ")
+        {
+            await OnOpenSaveModal.InvokeAsync();
+        }
+    }
 }
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor
index 2e147f5..46f53a0 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor
@@ -1,6 +1,8 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
+@using Microsoft.AspNetCore.Components.Web
+@inject IJSRuntime JSRuntime
 
 <span class="ec-field-value ec-field-value-multi ec-multi-list-editor" @onclick:stopPropagation="true">
     <ol class="ec-field-value-list">
@@ -53,7 +55,7 @@
                 </li>
             }
         }
-        else
+        else if (!AllowAddManagedValue)
         {
             <li class="ec-multi-list-row ec-multi-list-empty-hint">
                 <span class="text-muted">(none)</span>
@@ -65,7 +67,7 @@
             <li class="ec-multi-list-row ec-multi-list-add-item" @key="AddItemKey">
                 @if (_addingNew)
                 {
-                    <input class="form-control form-control-sm ec-multi-list-input"
+                    <input @ref="_addNewInputRef" class="form-control form-control-sm ec-multi-list-input"
                            placeholder="New value"
                            @bind="_draftValue" @bind:event="oninput" />
                     <span class="status-badge-inline">
@@ -102,6 +104,35 @@
     private int? _editingIndex;
     private bool _addingNew;
     private string _draftValue = "";
+    private bool _didAutoOpenAdd;
+    private bool _shouldFocusAddInput;
+    private ElementReference _addNewInputRef;
+
+    protected override void OnParametersSet()
+    {
+        if (!_didAutoOpenAdd && (SourceItems?.Count ?? 0) == 0 && AllowAddManagedValue)
+        {
+            _didAutoOpenAdd = true;
+            _addingNew = true;
+            _shouldFocusAddInput = true;
+        }
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (_shouldFocusAddInput && _addingNew)
+        {
+            _shouldFocusAddInput = false;
+            try
+            {
+                await _addNewInputRef.FocusAsync();
+            }
+            catch
+            {
+                // Focus can fail if the element is not yet in the DOM (e.g. prerender)
+            }
+        }
+    }
 
     private void BeginEdit(int index, string current)
     {
@@ -115,6 +146,7 @@
         _editingIndex = null;
         _addingNew = true;
         _draftValue = "";
+        _shouldFocusAddInput = true;
     }
 
     private void CancelInline()
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor
index 3044d35..9f47ddf 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor
@@ -34,6 +34,8 @@
             else
             {
                 <span class="text-muted">(none)</span>
+                <OptionStateBadge OptionName="@Label" ShowEditableBadge="true" EditableAsButton="true"
+                    FieldKey="@FieldKey" IsActiveEditor="false" IsInteractive="true" />
             }
         </span>
     }