From f17de1e59f76368f034c03158aaff2a1900b290d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 16 Dec 2025 14:23:05 +0000
Subject: [PATCH] Use keypress handler instead of reordering DOM elements

Co-authored-by: 0ski <1408674+0ski@users.noreply.github.com>
---
 .../app/components/primitives/FormButtons.tsx |  4 ++--
 .../route.tsx                                 | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/webapp/app/components/primitives/FormButtons.tsx b/apps/webapp/app/components/primitives/FormButtons.tsx
index d077227a2..e7d6db75d 100644
--- a/apps/webapp/app/components/primitives/FormButtons.tsx
+++ b/apps/webapp/app/components/primitives/FormButtons.tsx
@@ -12,11 +12,11 @@ export function FormButtons({
   return (
     <div
       className={cn(
-        "flex w-full flex-row-reverse items-center justify-between border-t border-grid-bright pt-4",
+        "flex w-full items-center justify-between border-t border-grid-bright pt-4",
         className
       )}
     >
-      {confirmButton} {cancelButton ? cancelButton : <div />}
+      {cancelButton ? cancelButton : <div />} {confirmButton}
     </div>
   );
 }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
index 0c069f31e..b3c6d3bfe 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
@@ -953,6 +953,18 @@ function QueueOverrideConcurrencyButton({
       navigation.formData?.get("action") === "queue-remove-override"
   );
 
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLFormElement>) => {
+    if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey && !e.altKey) {
+      e.preventDefault();
+      const overrideButton = e.currentTarget.querySelector(
+        'button[name="action"][value="queue-override"]'
+      ) as HTMLButtonElement;
+      if (overrideButton && !overrideButton.disabled) {
+        overrideButton.click();
+      }
+    }
+  };
+
   return (
     <Dialog open={isOpen} onOpenChange={setIsOpen}>
       <DialogTrigger asChild>
@@ -983,7 +995,12 @@ function QueueOverrideConcurrencyButton({
               set {queue.concurrencyLimit !== null ? "in code" : "by the environment"}.
             </Paragraph>
           )}
-          <Form method="post" onSubmit={() => setIsOpen(false)} className="space-y-3">
+          <Form
+            method="post"
+            onSubmit={() => setIsOpen(false)}
+            onKeyDown={handleKeyDown}
+            className="space-y-3"
+          >
             <input type="hidden" name="friendlyId" value={queue.id} />
             <div className="space-y-2">
               <label htmlFor="concurrencyLimit" className="text-sm text-text-bright">