From 5b838d0412013be7d42c505f4494456228d2feaa Mon Sep 17 00:00:00 2001
From: James Ritchie <james@trigger.dev>
Date: Mon, 16 Feb 2026 10:20:40 +0000
Subject: [PATCH 1/2] Keep the Query button width while in the isLoading state

---
 .../webapp/app/components/query/QueryEditor.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/webapp/app/components/query/QueryEditor.tsx b/apps/webapp/app/components/query/QueryEditor.tsx
index 6a986b49f2..7150c28533 100644
--- a/apps/webapp/app/components/query/QueryEditor.tsx
+++ b/apps/webapp/app/components/query/QueryEditor.tsx
@@ -354,9 +354,22 @@ const QueryEditorForm = forwardRef<
             variant="primary/small"
             disabled={isLoading || !query.trim()}
             shortcut={{ modifiers: ["mod"], key: "enter", enabledOnInputElements: true }}
-            LeadingIcon={isLoading ? <Spinner className="size-4" color="white" /> : undefined}
+            className={
+              isLoading
+                ? "relative !text-transparent [&_*]:!border-transparent [&_*]:!text-transparent"
+                : undefined
+            }
           >
-            {isLoading ? "Querying..." : "Query"}
+            {isLoading ? (
+              <>
+                Query
+                <span className="pointer-events-none absolute inset-0 flex items-center justify-center">
+                  <Spinner className="size-4 opacity-50" color="white" />
+                </span>
+              </>
+            ) : (
+              "Query"
+            )}
           </Button>
         </div>
       </fetcher.Form>

From 6725d592c0fbf284de5d1b238f66becd201ecbc4 Mon Sep 17 00:00:00 2001
From: James Ritchie <james@trigger.dev>
Date: Mon, 16 Feb 2026 10:30:39 +0000
Subject: [PATCH 2/2] Better spinner size

---
 apps/webapp/app/components/query/QueryEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/webapp/app/components/query/QueryEditor.tsx b/apps/webapp/app/components/query/QueryEditor.tsx
index 7150c28533..df7a4bd59d 100644
--- a/apps/webapp/app/components/query/QueryEditor.tsx
+++ b/apps/webapp/app/components/query/QueryEditor.tsx
@@ -1009,7 +1009,7 @@ function QueryTitle({
   if (isTitleLoading)
     return (
       <span className="flex items-center gap-2 text-text-dimmed">
-        <Spinner className="size-3" /> Generating title…
+        <Spinner className="size-4" /> Generating title…
       </span>
     );