diff --git a/public/scripts/preset-manager.js b/public/scripts/preset-manager.js
index 7127befc7..96b213600 100644
--- a/public/scripts/preset-manager.js
+++ b/public/scripts/preset-manager.js
@@ -25,7 +25,7 @@ import { ARGUMENT_TYPE, SlashCommandArgument } from './slash-commands/SlashComma
 import { enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
-import { system_prompts } from './sysprompt.js';
+import { checkForSystemPromptInInstructTemplate, system_prompts } from './sysprompt.js';
 import {
     textgenerationwebui_preset_names,
     textgenerationwebui_presets,
@@ -72,7 +72,7 @@ function autoSelectPreset() {
  * @param {string} apiId API id
  * @returns {PresetManager} Preset manager
  */
-function getPresetManager(apiId = '') {
+export function getPresetManager(apiId = '') {
     if (!apiId) {
         apiId = main_api == 'koboldhorde' ? 'kobold' : main_api;
     }
@@ -183,6 +183,10 @@ class PresetManager {
     }
 
     async savePreset(name, settings) {
+        if (this.apiId === 'instruct') {
+            await checkForSystemPromptInInstructTemplate(name, settings);
+        }
+
         const preset = settings ?? this.getPresetSettings(name);
 
         const response = await fetch('/api/presets/save', {
diff --git a/public/scripts/sysprompt.js b/public/scripts/sysprompt.js
index b212bf816..494d834d3 100644
--- a/public/scripts/sysprompt.js
+++ b/public/scripts/sysprompt.js
@@ -1,10 +1,13 @@
 import { saveSettingsDebounced } from '../script.js';
+import { callGenericPopup, POPUP_TYPE } from './popup.js';
 import { power_user } from './power-user.js';
+import { getPresetManager } from './preset-manager.js';
 import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js';
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { enumTypes, SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
+import { renderTemplateAsync } from './templates.js';
 import { isTrueBoolean, resetScrollHeight } from './utils.js';
 
 export let system_prompts = [];
@@ -39,7 +42,7 @@ export async function loadSystemPrompts(data) {
     }
 
     migrateSystemPromptFromInstructMode();
-    toggleSyspromptDisabledControls();
+    toggleSystemPromptDisabledControls();
 
     for (const prompt of system_prompts) {
         $('<option>').val(prompt.name).text(prompt.name).appendTo($select);
@@ -53,7 +56,29 @@ export async function loadSystemPrompts(data) {
     }
 }
 
-function toggleSyspromptDisabledControls() {
+/**
+ * Checks if the instruct template has a system prompt and prompts the user to save it as a system prompt.
+ * @param {string} name Name of the instruct template
+ * @param {object} template Instruct template object
+ */
+export async function checkForSystemPromptInInstructTemplate(name, template) {
+    if ('system_prompt' in template && name && template.system_prompt && !system_prompts.some(x => x.name === name)) {
+        const html = await renderTemplateAsync('migrateInstructPrompt', { prompt: template.system_prompt });
+        const confirm = await callGenericPopup(html, POPUP_TYPE.CONFIRM);
+        if (confirm) {
+            const prompt = { name: name, content: template.system_prompt };
+            const presetManager = getPresetManager('sysprompt');
+            await presetManager.savePreset(prompt.name, prompt);
+            toastr.success(`System prompt "${prompt.name}" has been saved.`);
+        } else {
+            toastr.info('System prompt has been discarded.');
+        }
+
+        delete template.system_prompt;
+    }
+}
+
+function toggleSystemPromptDisabledControls() {
     $enabled.parent().find('i').toggleClass('toggleEnabled', !!power_user.sysprompt.enabled);
     $contentBlock.toggleClass('disabled', !power_user.sysprompt.enabled);
 }
@@ -61,7 +86,7 @@ function toggleSyspromptDisabledControls() {
 function enableSystemPromptCallback() {
     power_user.sysprompt.enabled = true;
     $enabled.prop('checked', true);
-    toggleSyspromptDisabledControls();
+    toggleSystemPromptDisabledControls();
     saveSettingsDebounced();
     return '';
 }
@@ -69,7 +94,7 @@ function enableSystemPromptCallback() {
 function disableSystemPromptCallback() {
     power_user.sysprompt.enabled = false;
     $enabled.prop('checked', false);
-    toggleSyspromptDisabledControls();
+    toggleSystemPromptDisabledControls();
     saveSettingsDebounced();
     return '';
 }
@@ -112,7 +137,7 @@ function selectSystemPromptCallback(args, name) {
 jQuery(function () {
     $enabled.on('input', function () {
         power_user.sysprompt.enabled = !!$(this).prop('checked');
-        toggleSyspromptDisabledControls();
+        toggleSystemPromptDisabledControls();
         saveSettingsDebounced();
     });
 
diff --git a/public/scripts/templates/migrateInstructPrompt.html b/public/scripts/templates/migrateInstructPrompt.html
new file mode 100644
index 000000000..946d89089
--- /dev/null
+++ b/public/scripts/templates/migrateInstructPrompt.html
@@ -0,0 +1,7 @@
+<h3>
+    This instruct template also contains a system prompt.
+</h3>
+<div class="marginBot10">
+    Would you like to migrate the system prompt from the template?
+</div>
+<textarea class="wide100p textarea_compact" rows="8">{{prompt}}</textarea>