diff --git a/apps/portal/src/routes/(app)/calculator/+page.svelte b/apps/portal/src/routes/(app)/calculator/+page.svelte
index 0431acd..e7f31a3 100644
--- a/apps/portal/src/routes/(app)/calculator/+page.svelte
+++ b/apps/portal/src/routes/(app)/calculator/+page.svelte
@@ -328,7 +328,11 @@
         <select
             class="select select-sm w-36"
             value={currentEditor.configId ?? ""}
-            onchange={(e) => loadConfig(e.currentTarget.value)}
+            onchange={async (e) => {
+                const select = e.currentTarget;
+                await loadConfig(select.value);
+                select.value = editor?.configId ?? "";
+            }}
         >
             {#each configs as config}
                 <option value={config.id}>
@@ -372,7 +376,7 @@
         </button>
         <button
             class="btn btn-primary btn-sm"
-            hidden={isLive}
+            hidden={isLive && !isDirty}
             disabled={saving || !isDirty || isLive}
             onclick={save}
         >