diff --git a/apps/desktop/src/components/editor-area/note-header/sub-headers/enhanced-note-sub-header.tsx b/apps/desktop/src/components/editor-area/note-header/sub-headers/enhanced-note-sub-header.tsx
index b76a7f5bfe..ba31af0bda 100644
--- a/apps/desktop/src/components/editor-area/note-header/sub-headers/enhanced-note-sub-header.tsx
+++ b/apps/desktop/src/components/editor-area/note-header/sub-headers/enhanced-note-sub-header.tsx
@@ -39,13 +39,27 @@ export function EnhancedNoteSubHeader({
   const templatesQuery = useQuery({
     queryKey: ["templates"],
     queryFn: () =>
-      TemplateService.getAllTemplates().then((templates) =>
-        templates.map((template) => {
+      TemplateService.getAllTemplates().then((templates) => {
+        const sortedTemplates = templates.sort((a, b) => {
+          const aIsBuiltin = a.tags?.includes("builtin") || false;
+          const bIsBuiltin = b.tags?.includes("builtin") || false;
+
+          if (aIsBuiltin === bIsBuiltin) {
+            return 0;
+          }
+          return aIsBuiltin ? 1 : -1; // custom templates come first
+        });
+
+        return sortedTemplates.map((template) => {
           const title = template.title || "Untitled";
           const truncatedTitle = title.length > 30 ? title.substring(0, 30) + "..." : title;
-          return { id: template.id, title: truncatedTitle, fullTitle: template.title || "" };
-        })
-      ),
+          return {
+            id: template.id,
+            title: truncatedTitle,
+            fullTitle: template.title || "",
+          };
+        });
+      }),
     refetchOnWindowFocus: true,
   });
 
@@ -57,6 +71,13 @@ export function EnhancedNoteSubHeader({
     },
   });
 
+  const handleTemplateDropdownChange = (open: boolean) => {
+    setIsTemplateDropdownOpen(open);
+    if (open) {
+      templatesQuery.refetch();
+    }
+  };
+
   const handleRegenerateOrCancel = () => {
     if (isEnhancing) {
       // Cancel the enhancement
@@ -79,11 +100,11 @@ export function EnhancedNoteSubHeader({
       const actualTemplateId = templateId === "auto" ? null : templateId;
       onEnhance({ triggerType: "template", templateId: actualTemplateId });
     }
-    setIsTemplateDropdownOpen(false);
+    handleTemplateDropdownChange(false);
   };
 
   const handleAddTemplate = async () => {
-    setIsTemplateDropdownOpen(false);
+    handleTemplateDropdownChange(false);
     try {
       await windowsCommands.windowShow({ type: "settings" });
       await windowsCommands.windowNavigate({ type: "settings" }, "/app/settings?tab=templates");
@@ -144,37 +165,13 @@ export function EnhancedNoteSubHeader({
     <div className="flex items-center justify-end px-8 pt-2 pb-0.5">
       {/* Regenerate button */}
       <div className="flex items-center gap-2">
-        {
-          /* Share button
-        <Popover open={isShareDropdownOpen} onOpenChange={handleShareOpenChange}>
-          <PopoverTrigger asChild>
-            <Button
-              variant="outline"
-              size="sm"
-              className="text-xs h-6 px-3 hover:bg-neutral-100"
-            >
-              <Share2 size={14} className="mr-1.5" />
-              Share
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent
-            className="w-80 p-3 focus:outline-none focus:ring-0 focus:ring-offset-0"
-            align="end"
-            sideOffset={4}
-          >
-            <SharePopoverContent />
-          </PopoverContent>
-        </Popover>
-        */
-        }
-
         {/* Regenerate button with template dropdown */}
-        <Popover open={isTemplateDropdownOpen} onOpenChange={setIsTemplateDropdownOpen}>
+        <Popover open={isTemplateDropdownOpen} onOpenChange={handleTemplateDropdownChange}>
           <PopoverTrigger asChild>
             <Button
               variant="outline"
               size="sm"
-              onClick={isEnhancing ? handleRegenerateOrCancel : () => setIsTemplateDropdownOpen(true)}
+              onClick={isEnhancing ? handleRegenerateOrCancel : () => handleTemplateDropdownChange(true)}
               onMouseEnter={() => setIsHovered(true)}
               onMouseLeave={() => setIsHovered(false)}
               disabled={false}
@@ -269,7 +266,7 @@ export function EnhancedNoteSubHeader({
                 <span className="truncate">No Template (Default)</span>
               </div>
 
-              {/* Custom templates */}
+              {/* Templates */}
               {templatesQuery.data && templatesQuery.data.length > 0 && (
                 <>
                   <div className="my-1 border-t border-neutral-200"></div>
diff --git a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
index 9f34841a6d..93ccfac22c 100644
--- a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
+++ b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
@@ -505,11 +505,11 @@ export function ChatInput(
       {/* Bottom area stays fixed */}
       <div className="flex items-center justify-between pt-2 pb-2 px-3 flex-shrink-0">
         <button
-          className="text-xs text-neutral-500 hover:text-neutral-700 transition-colors cursor-pointer flex items-center gap-1"
+          className="text-xs text-neutral-500 hover:text-neutral-700 transition-colors cursor-pointer flex items-center gap-1 min-w-0"
           onClick={() => setIsModelModalOpen(true)}
         >
-          <BrainIcon className="h-3 w-3" />
-          {getCurrentModelName()}
+          <BrainIcon className="h-3 w-3 flex-shrink-0" />
+          <span className="truncate max-w-[120px]">{getCurrentModelName()}</span>
         </button>
 
         <Button