diff --git a/Components/ChatInput.svelte b/Components/ChatInput.svelte
index a59ab2e..ea29581 100644
--- a/Components/ChatInput.svelte
+++ b/Components/ChatInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onDestroy, tick } from "svelte";
+  import { onDestroy, onMount, tick } from "svelte";
   import { Platform, setIcon, type EventRef } from "obsidian";
 	import type { UserInputService } from "Services/UserInputService";
 	import type { ISearchState, SearchStateStore } from "Stores/SearchStateStore";
@@ -20,7 +20,7 @@
 	import { InputMode } from "Enums/InputMode";
 	import { Copy, replaceCopy } from "Enums/Copy";
 	import { HelpModal } from "Modals/HelpModal";
-  import { sleep } from "Helpers/Helpers";
+	import type { IPrompt } from "AIPrompts/IPrompt";
 
   export let attachments: Attachment[] = [];
 
@@ -36,6 +36,7 @@
   const searchStateStore: SearchStateStore = Resolve<SearchStateStore>(Services.SearchStateStore);
   const diffService: DiffService = Resolve<DiffService>(Services.DiffService);
   const eventService: EventService = Resolve<EventService>(Services.EventService);
+  const aiPrompt: IPrompt = Resolve<IPrompt>(Services.IPrompt);
 
   const searchState: Writable<ISearchState> = searchStateStore.searchState;
 
@@ -46,7 +47,8 @@
   let editModeButton: HTMLButtonElement;
   let planningModeButton: HTMLButtonElement;
 
-  let userInstructionActive: boolean = false;
+  let userInstructionAreaActive: boolean = false;
+  let userInstructionActive: boolean = true;
 
   let userRequest: string = "";
 
@@ -60,6 +62,10 @@
   const diffClosedRef: EventRef = eventService.on(Event.DiffClosed, () => { inputMode = InputMode.Normal; focusInput(); });
   const rateLimitCountdownRef: EventRef = eventService.on(Event.RateLimitCountdown, (delayMs: number) => { startCountdown(delayMs); });
 
+  onMount(async () => {
+    userInstructionActive = (await aiPrompt.userInstruction()).trim() !== "";
+  });
+
   onDestroy(() => {
     eventService.offref(diffOpenedRef);
     eventService.offref(diffClosedRef);
@@ -156,6 +162,12 @@
     setIcon(userInstructionButton, "user-round-pen");
   }
 
+  $: userInstructionAreaActive, (() => {
+    tick().then(async () => {
+      userInstructionActive = (await aiPrompt.userInstruction()).trim() !== "";
+    });
+  })();
+
   $: if (submitButton) {
     if (inputMode === InputMode.Question || inputMode === InputMode.Diff) {
       setIcon(submitButton, userRequest.trim() === "" ? "square" : "send-horizontal");
@@ -245,6 +257,11 @@
     return { request: request, formattedRequest: formattedRequest };
   }
 
+  function toggleUserInstructionArea() {
+    userInstructionAreaActive = !userInstructionAreaActive;
+    searchStateStore.resetSearch();
+  }
+
   function toggleEditMode() {
     if (planningModeActive) {
       planningModeActive = false
@@ -266,7 +283,7 @@
   }
 
   async function handleKeydown(e: KeyboardEvent) {
-    userInstructionActive = false;
+    userInstructionAreaActive = false;
     if ($searchState.active) {
       await continueSearch(e);
       return;
@@ -471,15 +488,15 @@
     <ChatSearchResults searchState={$searchState} onResultAccept={handleSearchResultAcceptance}/>
   </div>
 
-  <div id="user-instruction-container" style:padding-top={userInstructionActive ? "var(--size-4-2)" : 0}>
-    <UserInstruction focusInput={focusInput} bind:userInstructionActive={userInstructionActive}/>
+  <div id="user-instruction-container" style:padding-top={userInstructionAreaActive ? "var(--size-4-2)" : 0}>
+    <UserInstruction focusInput={focusInput} bind:userInstructionAreaActive={userInstructionAreaActive}/>
   </div>
 
   <button
     id="user-instruction-button"
     class:instruction-active={userInstructionActive}
     bind:this={userInstructionButton}
-    on:click={() => { userInstructionActive = !userInstructionActive; searchStateStore.resetSearch() }}
+    on:click={toggleUserInstructionArea}
     aria-label="User Instruction">
   </button>
 
@@ -597,7 +614,7 @@
   }
 
   #user-instruction-button.instruction-active {
-    box-shadow: 0px 0px 4px 1px var(--color-accent);
+    box-shadow: 0px 0px 2px 1px var(--color-accent);
   }
 
   #input-field {
diff --git a/Components/UserInstruction.svelte b/Components/UserInstruction.svelte
index cde0cbe..f122a4f 100644
--- a/Components/UserInstruction.svelte
+++ b/Components/UserInstruction.svelte
@@ -10,7 +10,7 @@
 	import { tick } from "svelte";
 
     export let focusInput: () => void;
-    export let userInstructionActive: boolean;
+    export let userInstructionAreaActive: boolean;
 
     const settingsService: SettingsService = Resolve<SettingsService>(Services.SettingsService);
     const fileSystemService: FileSystemService = Resolve<FileSystemService>(Services.FileSystemService);
@@ -31,11 +31,11 @@
         scrollSelectedIntoView();
     }
 
-    $: if (userInstructionActive) {
+    $: if (userInstructionAreaActive) {
         selectedInstruction = 0;
         loadUserInstructions();
         setTimeout(() => {
-            if (resultsContainer && userInstructionActive) {
+            if (resultsContainer && userInstructionAreaActive) {
                 document.addEventListener("click", handleClickOutside);
             }
         }, 10);
@@ -59,7 +59,7 @@
 
     function handleClickOutside(event: MouseEvent) {
         if (resultsContainer && !resultsContainer.contains(event.target as Node)) {
-            userInstructionActive = false;
+            userInstructionAreaActive = false;
         }
     }
 
@@ -83,14 +83,14 @@
             settingsService.settings.userInstruction = userInstructions[selectedInstruction];
             settingsService.saveSettings();
         }
-        userInstructionActive = false;
+        userInstructionAreaActive = false;
 
         e?.preventDefault();
         focusInput();
     }
 
     async function handleKeydown(e: KeyboardEvent) {
-        if (!userInstructionActive) {
+        if (!userInstructionAreaActive) {
             return;
         }
         e.preventDefault();
@@ -110,7 +110,7 @@
         }
 
         if (e.key === "Escape") {
-            userInstructionActive = false;
+            userInstructionAreaActive = false;
             return;
         }
     }
@@ -134,7 +134,7 @@
 </script>
 
 <div id="user-instruction-results" style:height="{height}px" bind:this={resultsContainer}>
-    {#if userInstructionActive}
+    {#if userInstructionAreaActive}
         {#if userInstructions.length === 0}
             <div bind:this={emptyInstructionsContentDiv}>
                 <div id="user-instruction-empty" class="user-instruction-container">