diff --git a/apps/desktop/src/components/editor-area/floating-button.tsx b/apps/desktop/src/components/editor-area/floating-button.tsx
index 0c3141ff7e..f59c63e7ca 100644
--- a/apps/desktop/src/components/editor-area/floating-button.tsx
+++ b/apps/desktop/src/components/editor-area/floating-button.tsx
@@ -147,7 +147,6 @@ export function FloatingButton({
 
       const handleWindowFocus = () => {
         queryClient.invalidateQueries({ queryKey: ["templates"] });
-        queryClient.invalidateQueries({ queryKey: ["llm-connection"] });
         window.removeEventListener("focus", handleWindowFocus);
       };
 
diff --git a/apps/desktop/src/components/editor-area/index.tsx b/apps/desktop/src/components/editor-area/index.tsx
index afc2b3eb6d..54ef5fa5ac 100644
--- a/apps/desktop/src/components/editor-area/index.tsx
+++ b/apps/desktop/src/components/editor-area/index.tsx
@@ -63,37 +63,12 @@ export default function EditorArea({
     [sessionId, showRaw],
   );
 
-  const [needsRestoration, setNeedsRestoration] = useState(false);
-  const [originalTemplateId, setOriginalTemplateId] = useState<string | null>(null);
-  const queryClient = useQueryClient();
-
-  const configQuery = useQuery({
-    queryKey: ["config", "general"],
-    queryFn: async () => {
-      const result = await dbCommands.getConfig();
-      return result;
-    },
-  });
-
-  const setConfigMutation = useMutation({
-    mutationFn: async (configData: any) => {
-      await dbCommands.setConfig(configData);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["config", "general"] });
-    },
-    onError: (error) => {
-      console.error("Failed to set template config:", error);
-    },
-  });
-
   const templatesQuery = useQuery({
     queryKey: ["templates"],
     queryFn: () => dbCommands.listTemplates(),
     refetchOnWindowFocus: true,
   });
 
-  const generateTitle = useGenerateTitleMutation({ sessionId });
   const preMeetingNote = useSession(sessionId, (s) => s.session.pre_meeting_memo_html) ?? "";
   const hasTranscriptWords = useSession(sessionId, (s) => s.session.words.length > 0);
 
@@ -108,27 +83,14 @@ export default function EditorArea({
     rawContent,
     isLocalLlm: llmConnectionQuery.data?.type === "HyprLocal",
     onSuccess: (content) => {
-      generateTitle.mutate({ enhancedContent: content });
-
-      if (needsRestoration && configQuery.data) {
-        const restoreConfig = {
-          ...configQuery.data,
-          general: {
-            ...configQuery.data.general,
-            selected_template_id: originalTemplateId,
-          },
-        };
-        setConfigMutation.mutate(restoreConfig);
-        setNeedsRestoration(false);
-        setOriginalTemplateId(null);
-      }
-
       if (hasTranscriptWords) {
         generateTitle.mutate({ enhancedContent: content });
       }
     },
   });
 
+  const generateTitle = useGenerateTitleMutation({ sessionId });
+
   useAutoEnhance({
     sessionId,
     enhanceStatus: enhance.status,
@@ -151,46 +113,13 @@ export default function EditorArea({
     [showRaw, enhancedContent, rawContent],
   );
 
-  const handleEnhanceWithTemplate = useCallback(async (templateId: string) => {
-    if (configQuery.data) {
-      const currentTemplateId = configQuery.data.general?.selected_template_id || null;
-      setOriginalTemplateId(currentTemplateId);
-      setNeedsRestoration(true);
-
-      const targetTemplateId = templateId === "auto" ? null : templateId;
-
-      const updatedConfig = {
-        ...configQuery.data,
-        general: {
-          ...configQuery.data.general,
-          selected_template_id: targetTemplateId,
-        },
-      };
-
-      try {
-        await setConfigMutation.mutateAsync(updatedConfig);
-
-        await new Promise(resolve => setTimeout(resolve, 200));
-
-        const verifyConfig = await dbCommands.getConfig();
-
-        if (verifyConfig.general?.selected_template_id !== targetTemplateId) {
-          setOriginalTemplateId(null);
-          setNeedsRestoration(false);
-          return;
-        }
-      } catch (error) {
-        setOriginalTemplateId(null);
-        setNeedsRestoration(false);
-        return;
-      }
-    }
-
-    enhance.mutate();
-  }, [enhance, configQuery.data, setConfigMutation]);
+  const handleEnhanceWithTemplate = useCallback((templateId: string) => {
+    const targetTemplateId = templateId === "auto" ? null : templateId;
+    enhance.mutate({ templateId: targetTemplateId, triggerType: "template" });
+  }, [enhance]);
 
   const handleClickEnhance = useCallback(() => {
-    enhance.mutate();
+    enhance.mutate({ triggerType: "manual" });
   }, [enhance]);
 
   const safelyFocusEditor = useCallback(() => {
@@ -317,7 +246,13 @@ export function useEnhanceMutation({
 
   const enhance = useMutation({
     mutationKey: ["enhance", sessionId],
-    mutationFn: async () => {
+    mutationFn: async ({
+      triggerType,
+      templateId,
+    }: {
+      triggerType: "manual" | "template" | "auto";
+      templateId?: string | null;
+    } = { triggerType: "manual" }) => {
       await queryClient.invalidateQueries({ queryKey: ["llm-connection"] });
       await new Promise(resolve => setTimeout(resolve, 100));
 
@@ -347,15 +282,20 @@ export function useEnhanceMutation({
         return;
       }
 
+      // Get current config for default template
       const config = await dbCommands.getConfig();
 
+      // Use provided templateId or fall back to config
+      const effectiveTemplateId = templateId !== undefined
+        ? templateId
+        : config.general?.selected_template_id;
+
       let templateInfo = "";
       let customGrammar: string | null = null;
-      const selectedTemplateId = config.general.selected_template_id;
 
-      if (selectedTemplateId) {
+      if (effectiveTemplateId) {
         const templates = await dbCommands.listTemplates();
-        const selectedTemplate = templates.find(t => t.id === selectedTemplateId);
+        const selectedTemplate = templates.find(t => t.id === effectiveTemplateId);
 
         if (selectedTemplate) {
           if (selectedTemplate.sections && selectedTemplate.sections.length > 0) {
@@ -560,9 +500,11 @@ function useAutoEnhance({
 }: {
   sessionId: string;
   enhanceStatus: string;
-  enhanceMutate: () => void;
+  enhanceMutate: (params: { triggerType: "auto"; templateId?: string | null }) => void;
 }) {
   const ongoingSessionStatus = useOngoingSession((s) => s.status);
+  const autoEnhanceTemplate = useOngoingSession((s) => s.autoEnhanceTemplate);
+  const setAutoEnhanceTemplate = useOngoingSession((s) => s.setAutoEnhanceTemplate);
   const prevOngoingSessionStatus = usePreviousValue(ongoingSessionStatus);
   const setShowRaw = useSession(sessionId, (s) => s.setShowRaw);
 
@@ -573,7 +515,15 @@ function useAutoEnhance({
       && enhanceStatus !== "pending"
     ) {
       setShowRaw(false);
-      enhanceMutate();
+
+      // Use the selected template and then clear it
+      enhanceMutate({
+        triggerType: "auto",
+        templateId: autoEnhanceTemplate,
+      });
+
+      // Clear the template after using it (one-time use)
+      setAutoEnhanceTemplate(null);
     }
   }, [
     ongoingSessionStatus,
@@ -581,6 +531,9 @@ function useAutoEnhance({
     sessionId,
     enhanceMutate,
     setShowRaw,
+    autoEnhanceTemplate,
+    setAutoEnhanceTemplate,
+    prevOngoingSessionStatus,
   ]);
 }
 
diff --git a/apps/desktop/src/components/editor-area/note-header/listen-button.tsx b/apps/desktop/src/components/editor-area/note-header/listen-button.tsx
index 102cd9fd2a..41bf303c84 100644
--- a/apps/desktop/src/components/editor-area/note-header/listen-button.tsx
+++ b/apps/desktop/src/components/editor-area/note-header/listen-button.tsx
@@ -6,10 +6,12 @@ import { useEffect, useState } from "react";
 import SoundIndicator from "@/components/sound-indicator";
 import { useHypr } from "@/contexts";
 import { useEnhancePendingState } from "@/hooks/enhance-pending";
+import { commands as dbCommands } from "@hypr/plugin-db";
 import { commands as listenerCommands } from "@hypr/plugin-listener";
 import { commands as localSttCommands } from "@hypr/plugin-local-stt";
 import { Button } from "@hypr/ui/components/ui/button";
 import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@hypr/ui/components/ui/select";
 import { Spinner } from "@hypr/ui/components/ui/spinner";
 import { sonnerToast, toast } from "@hypr/ui/components/ui/toast";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@hypr/ui/components/ui/tooltip";
@@ -222,6 +224,7 @@ function WhenActive() {
   const ongoingSessionStore = useOngoingSession((s) => ({
     pause: s.pause,
     stop: s.stop,
+    setAutoEnhanceTemplate: s.setAutoEnhanceTemplate,
   }));
   const sessionWords = useSession(ongoingSessionId!, (s) => s.session.words);
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
@@ -231,7 +234,11 @@ function WhenActive() {
     setIsPopoverOpen(false);
   };
 
-  const handleStopSession = () => {
+  const handleStopSession = (templateId?: string | null) => {
+    if (templateId !== undefined) {
+      ongoingSessionStore.setAutoEnhanceTemplate(templateId);
+    }
+
     ongoingSessionStore.stop();
     setIsPopoverOpen(false);
 
@@ -241,7 +248,7 @@ function WhenActive() {
   };
 
   return (
-    <Popover>
+    <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
       <PopoverTrigger asChild>
         <button
           className={cn([
@@ -268,12 +275,13 @@ function RecordingControls({
   onStop,
 }: {
   onPause: () => void;
-  onStop: () => void;
+  onStop: (templateId?: string | null) => void;
 }) {
   const ongoingSessionMuted = useOngoingSession((s) => ({
     micMuted: s.micMuted,
     speakerMuted: s.speakerMuted,
   }));
+  const [selectedTemplate, setSelectedTemplate] = useState<string>("auto");
 
   const toggleMicMuted = useMutation({
     mutationFn: () => listenerCommands.setMicMuted(!ongoingSessionMuted.micMuted),
@@ -283,9 +291,34 @@ function RecordingControls({
     mutationFn: () => listenerCommands.setSpeakerMuted(!ongoingSessionMuted.speakerMuted),
   });
 
+  const configQuery = useQuery({
+    queryKey: ["config"],
+    queryFn: () => dbCommands.getConfig(),
+    refetchOnWindowFocus: true,
+  });
+
+  const templatesQuery = useQuery({
+    queryKey: ["templates"],
+    queryFn: () => dbCommands.listTemplates(),
+    refetchOnWindowFocus: true,
+  });
+
+  useEffect(() => {
+    if (configQuery.data?.general?.selected_template_id) {
+      setSelectedTemplate(configQuery.data.general.selected_template_id);
+    } else {
+      setSelectedTemplate("auto");
+    }
+  }, [configQuery.data]);
+
+  const handleStopWithTemplate = () => {
+    const actualTemplateId = selectedTemplate === "auto" ? null : selectedTemplate;
+    onStop(actualTemplateId);
+  };
+
   return (
     <>
-      <div className="flex w-full justify-between mb-4">
+      <div className="flex w-full justify-between mb-3">
         <AudioControlButton
           isMuted={ongoingSessionMuted.micMuted}
           onClick={() => toggleMicMuted.mutate()}
@@ -298,6 +331,24 @@ function RecordingControls({
         />
       </div>
 
+      <div className="mb-3">
+        <Select value={selectedTemplate} onValueChange={setSelectedTemplate}>
+          <SelectTrigger className="w-full text-sm">
+            <SelectValue placeholder="Select template..." />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="auto">
+              <Trans>No Template (Default)</Trans>
+            </SelectItem>
+            {templatesQuery.data?.map((template) => (
+              <SelectItem key={template.id} value={template.id}>
+                {template.title || "Untitled"}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      </div>
+
       <div className="flex gap-2">
         <Button
           variant="outline"
@@ -309,7 +360,7 @@ function RecordingControls({
         </Button>
         <Button
           variant="destructive"
-          onClick={onStop}
+          onClick={handleStopWithTemplate}
           className="w-full"
         >
           <StopCircleIcon size={16} />
diff --git a/apps/desktop/src/locales/en/messages.po b/apps/desktop/src/locales/en/messages.po
index a7838c2092..9ef9136627 100644
--- a/apps/desktop/src/locales/en/messages.po
+++ b/apps/desktop/src/locales/en/messages.po
@@ -256,8 +256,8 @@ msgstr "(Beta) Upcoming meeting notifications"
 #. placeholder {0}: disabled ? "Wait..." : isHovered ? "Resume" : "Ended"
 #: src/components/settings/components/calendar/cloud-calendar-integration-details.tsx:36
 #: src/components/settings/components/ai/wer-modal.tsx:116
-#: src/components/editor-area/note-header/listen-button.tsx:176
-#: src/components/editor-area/note-header/listen-button.tsx:215
+#: src/components/editor-area/note-header/listen-button.tsx:178
+#: src/components/editor-area/note-header/listen-button.tsx:217
 msgid "{0}"
 msgstr "{0}"
 
@@ -371,6 +371,10 @@ msgstr "Ask questions about past meetings"
 msgid "Assistant:"
 msgstr "Assistant:"
 
+#: src/components/editor-area/note-header/listen-button.tsx:341
+#~ msgid "Auto (Default)"
+#~ msgstr "Auto (Default)"
+
 #: src/routes/app.settings.tsx:49
 msgid "Billing"
 msgstr "Billing"
@@ -828,6 +832,14 @@ msgstr "No recent notes for this organization"
 msgid "No speech-to-text models available or failed to load."
 msgstr "No speech-to-text models available or failed to load."
 
+#: src/components/editor-area/note-header/listen-button.tsx:341
+#~ msgid "No Template"
+#~ msgstr "No Template"
+
+#: src/components/editor-area/note-header/listen-button.tsx:341
+msgid "No Template (Default)"
+msgstr "No Template (Default)"
+
 #: src/components/settings/views/templates.tsx:265
 msgid "No templates yet"
 msgstr "No templates yet"
@@ -881,7 +893,7 @@ msgstr "Optional for participant suggestions"
 msgid "Owner"
 msgstr "Owner"
 
-#: src/components/editor-area/note-header/listen-button.tsx:308
+#: src/components/editor-area/note-header/listen-button.tsx:359
 msgid "Pause"
 msgstr "Pause"
 
@@ -893,7 +905,7 @@ msgstr "people"
 msgid "Performance difference between languages"
 msgstr "Performance difference between languages"
 
-#: src/components/editor-area/note-header/listen-button.tsx:195
+#: src/components/editor-area/note-header/listen-button.tsx:197
 msgid "Play video"
 msgstr "Play video"
 
@@ -937,7 +949,7 @@ msgstr "Required to transcribe other people's voice during meetings"
 msgid "Required to transcribe your voice during meetings"
 msgstr "Required to transcribe your voice during meetings"
 
-#: src/components/editor-area/note-header/listen-button.tsx:104
+#: src/components/editor-area/note-header/listen-button.tsx:106
 msgid "Resume"
 msgstr "Resume"
 
@@ -1035,11 +1047,11 @@ msgstr "Start Annual Plan"
 msgid "Start Monthly Plan"
 msgstr "Start Monthly Plan"
 
-#: src/components/editor-area/note-header/listen-button.tsx:151
+#: src/components/editor-area/note-header/listen-button.tsx:153
 msgid "Start recording"
 msgstr "Start recording"
 
-#: src/components/editor-area/note-header/listen-button.tsx:316
+#: src/components/editor-area/note-header/listen-button.tsx:367
 msgid "Stop"
 msgstr "Stop"
 
diff --git a/apps/desktop/src/locales/ko/messages.po b/apps/desktop/src/locales/ko/messages.po
index e733c203de..1a6511d356 100644
--- a/apps/desktop/src/locales/ko/messages.po
+++ b/apps/desktop/src/locales/ko/messages.po
@@ -256,8 +256,8 @@ msgstr ""
 #. placeholder {0}: disabled ? "Wait..." : isHovered ? "Resume" : "Ended"
 #: src/components/settings/components/calendar/cloud-calendar-integration-details.tsx:36
 #: src/components/settings/components/ai/wer-modal.tsx:116
-#: src/components/editor-area/note-header/listen-button.tsx:176
-#: src/components/editor-area/note-header/listen-button.tsx:215
+#: src/components/editor-area/note-header/listen-button.tsx:178
+#: src/components/editor-area/note-header/listen-button.tsx:217
 msgid "{0}"
 msgstr ""
 
@@ -371,6 +371,10 @@ msgstr ""
 msgid "Assistant:"
 msgstr ""
 
+#: src/components/editor-area/note-header/listen-button.tsx:341
+#~ msgid "Auto (Default)"
+#~ msgstr ""
+
 #: src/routes/app.settings.tsx:49
 msgid "Billing"
 msgstr ""
@@ -828,6 +832,14 @@ msgstr ""
 msgid "No speech-to-text models available or failed to load."
 msgstr ""
 
+#: src/components/editor-area/note-header/listen-button.tsx:341
+#~ msgid "No Template"
+#~ msgstr ""
+
+#: src/components/editor-area/note-header/listen-button.tsx:341
+msgid "No Template (Default)"
+msgstr ""
+
 #: src/components/settings/views/templates.tsx:265
 msgid "No templates yet"
 msgstr ""
@@ -881,7 +893,7 @@ msgstr ""
 msgid "Owner"
 msgstr ""
 
-#: src/components/editor-area/note-header/listen-button.tsx:308
+#: src/components/editor-area/note-header/listen-button.tsx:359
 msgid "Pause"
 msgstr ""
 
@@ -893,7 +905,7 @@ msgstr ""
 msgid "Performance difference between languages"
 msgstr ""
 
-#: src/components/editor-area/note-header/listen-button.tsx:195
+#: src/components/editor-area/note-header/listen-button.tsx:197
 msgid "Play video"
 msgstr ""
 
@@ -937,7 +949,7 @@ msgstr ""
 msgid "Required to transcribe your voice during meetings"
 msgstr ""
 
-#: src/components/editor-area/note-header/listen-button.tsx:104
+#: src/components/editor-area/note-header/listen-button.tsx:106
 msgid "Resume"
 msgstr ""
 
@@ -1035,11 +1047,11 @@ msgstr ""
 msgid "Start Monthly Plan"
 msgstr ""
 
-#: src/components/editor-area/note-header/listen-button.tsx:151
+#: src/components/editor-area/note-header/listen-button.tsx:153
 msgid "Start recording"
 msgstr ""
 
-#: src/components/editor-area/note-header/listen-button.tsx:316
+#: src/components/editor-area/note-header/listen-button.tsx:367
 msgid "Stop"
 msgstr ""
 
diff --git a/apps/docs/data/i18n.json b/apps/docs/data/i18n.json
index 65897c54c1..56fec56722 100644
--- a/apps/docs/data/i18n.json
+++ b/apps/docs/data/i18n.json
@@ -1,12 +1,12 @@
 [
   {
     "language": "ko",
-    "total": 282,
-    "missing": 282
+    "total": 285,
+    "missing": 285
   },
   {
     "language": "en (source)",
-    "total": 282,
+    "total": 285,
     "missing": 0
   }
 ]
diff --git a/packages/utils/src/stores/ongoing-session.ts b/packages/utils/src/stores/ongoing-session.ts
index 2be6dc4f40..fe2195e7de 100644
--- a/packages/utils/src/stores/ongoing-session.ts
+++ b/packages/utils/src/stores/ongoing-session.ts
@@ -13,12 +13,14 @@ type State = {
   enhanceController: AbortController | null;
   micMuted: boolean;
   speakerMuted: boolean;
+  autoEnhanceTemplate: string | null;
 };
 
 type Actions = {
   get: () => State & Actions;
   cancelEnhance: () => void;
   setEnhanceController: (controller: AbortController | null) => void;
+  setAutoEnhanceTemplate: (templateId: string | null) => void;
   start: (sessionId: string) => void;
   stop: () => void;
   pause: () => void;
@@ -33,6 +35,7 @@ const initialState: State = {
   enhanceController: null,
   micMuted: false,
   speakerMuted: false,
+  autoEnhanceTemplate: null,
 };
 
 export type OngoingSessionStore = ReturnType<typeof createOngoingSessionStore>;
@@ -61,6 +64,13 @@ export const createOngoingSessionStore = (
         })
       );
     },
+    setAutoEnhanceTemplate: (templateId: string | null) => {
+      set((state) =>
+        mutate(state, (draft) => {
+          draft.autoEnhanceTemplate = templateId;
+        })
+      );
+    },
     start: (sessionId: string) => {
       console.log("start", sessionId);
       set((state) =>