diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Settings.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Settings.cs
index 39d3b1f855..7f877664bd 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Settings.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Settings.cs
@@ -118,6 +118,10 @@ public sealed partial class Settings : ICommandSettings
             _settings = settings;
             Name = "Settings";
             Icon = new IconInfo("\uE713"); // Settings icon
+
+            // When our settings change, make sure to let CmdPal know to
+            // retrieve the new forms
+            _settings.SettingsChanged += (s, e) => RaiseItemsChanged();
         }
     }
 
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/SettingsForm.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/SettingsForm.cs
index fa23cd8f0d..79f548bf56 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/SettingsForm.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/SettingsForm.cs
@@ -24,6 +24,12 @@ public partial class SettingsForm : FormContent
             return CommandResult.KeepOpen();
         }
 
+        // Re-render the current value of the settings to a card. The
+        // SettingsContentPage will raise an ItemsChanged in its own
+        // SettingsChange handler, so we need to be prepared to return the
+        // current settings value.
+        TemplateJson = _settings.ToFormJson();
+
         _settings.Update(inputs);
         _settings.RaiseSettingsChanged();