diff --git a/public/scripts/preset-manager.js b/public/scripts/preset-manager.js
index 29f44c747..d46996d7a 100644
--- a/public/scripts/preset-manager.js
+++ b/public/scripts/preset-manager.js
@@ -455,7 +455,7 @@ class PresetManager {
     }
 
     isKeyedApi() {
-        return this.apiId == 'textgenerationwebui' || this.apiId == 'context' || this.apiId == 'instruct';
+        return this.apiId == 'textgenerationwebui' || this.isAdvancedFormatting();
     }
 
     isAdvancedFormatting() {
diff --git a/public/scripts/sysprompt.js b/public/scripts/sysprompt.js
index 038fc4bd6..e90081844 100644
--- a/public/scripts/sysprompt.js
+++ b/public/scripts/sysprompt.js
@@ -153,7 +153,7 @@ export function initSystemPrompts() {
         saveSettingsDebounced();
     });
 
-    $select.on('input', async function () {
+    $select.on('change', async function () {
         if (!power_user.sysprompt.enabled) {
             $enabled.prop('checked', true).trigger('input');
         }