diff --git a/services/hackbot-ui/app/page.tsx b/services/hackbot-ui/app/page.tsx
index bd79a58d3d..bc2183bbb0 100644
--- a/services/hackbot-ui/app/page.tsx
+++ b/services/hackbot-ui/app/page.tsx
@@ -1,3 +1,5 @@
+import { Suspense } from "react";
+
 import { RecentRuns } from "@/components/RecentRuns";
 import { TriggerForm } from "@/components/TriggerForm";
 
@@ -6,7 +8,9 @@ export default function HomePage() {
     <>
       <div className="panel">
         <h2>Trigger a run</h2>
-        <TriggerForm />
+        <Suspense fallback={null}>
+          <TriggerForm />
+        </Suspense>
       </div>
 
       <div className="panel">
diff --git a/services/hackbot-ui/components/TriggerForm.tsx b/services/hackbot-ui/components/TriggerForm.tsx
index 9bb145ca77..a8ae657bb1 100644
--- a/services/hackbot-ui/components/TriggerForm.tsx
+++ b/services/hackbot-ui/components/TriggerForm.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useRouter } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { useState } from "react";
 
 import { saveRun } from "@/lib/store";
@@ -15,17 +15,32 @@ const AGENTS = [
 
 type AgentValue = (typeof AGENTS)[number]["value"];
 
+function parseAgent(value: string | null): AgentValue {
+  return AGENTS.some((a) => a.value === value)
+    ? (value as AgentValue)
+    : "bug-fix";
+}
+
 export function TriggerForm() {
   const router = useRouter();
-  const [agent, setAgent] = useState<AgentValue>("bug-fix");
-  const [bugId, setBugId] = useState("");
-  const [bugData, setBugData] = useState("");
-  const [gitCommit, setGitCommit] = useState("");
-  const [failureTasks, setFailureTasks] = useState("");
-  const [runTryPush, setRunTryPush] = useState(false);
-  const [model, setModel] = useState("");
-  const [maxTurns, setMaxTurns] = useState("");
-  const [effort, setEffort] = useState("");
+  const params = useSearchParams();
+  const [agent, setAgent] = useState<AgentValue>(() =>
+    parseAgent(params.get("agent"))
+  );
+  const [bugId, setBugId] = useState(() => params.get("bug_id") ?? "");
+  const [bugData, setBugData] = useState(() => params.get("bug_data") ?? "");
+  const [gitCommit, setGitCommit] = useState(
+    () => params.get("git_commit") ?? ""
+  );
+  const [failureTasks, setFailureTasks] = useState(
+    () => params.get("failure_tasks") ?? ""
+  );
+  const [runTryPush, setRunTryPush] = useState(
+    () => params.get("run_try_push") === "true"
+  );
+  const [model, setModel] = useState(() => params.get("model") ?? "");
+  const [maxTurns, setMaxTurns] = useState(() => params.get("max_turns") ?? "");
+  const [effort, setEffort] = useState(() => params.get("effort") ?? "");
   const [submitting, setSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);