diff --git a/app/routes/edit-form.tsx b/app/routes/edit-form.tsx
new file mode 100644
index 0000000..4358ef0
--- /dev/null
+++ b/app/routes/edit-form.tsx
@@ -0,0 +1,181 @@
+import { useState, useEffect } from "react"
+import { useNavigate, useParams, Link } from "react-router"
+import { ArrowLeft } from "lucide-react"
+import { Navbar } from "@/components/shared/navbar"
+import { Footer } from "@/components/shared/footer"
+import { FormInput } from "@/components/shared/form-input"
+import { FormButton } from "@/components/shared/form-button"
+import { QuestionEditor } from "@/components/forms/question-editor"
+import { useAuth } from "@/app/context/auth-context"
+import { getFormById, updateForm } from "@/lib/api"
+import type { CreateQuestion } from "@/lib/types"
+
+const TYPES_WITH_OPTIONS = ["multiple_choice", "checkbox", "dropdown"]
+
+export default function EditFormPage() {
+  const { id } = useParams()
+  const { user, loading: authLoading } = useAuth()
+  const navigate = useNavigate()
+
+  const [title, setTitle] = useState("")
+  const [description, setDescription] = useState("")
+  const [questions, setQuestions] = useState<CreateQuestion[]>([])
+  const [loadingForm, setLoadingForm] = useState(true)
+  const [submitting, setSubmitting] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!authLoading && !user) {
+      navigate("/login")
+    }
+  }, [user, authLoading, navigate])
+
+  useEffect(() => {
+    if (!id || authLoading || !user) return
+
+    async function fetchForm() {
+      try {
+        const data = await getFormById(id!)
+        setTitle(data.title)
+        setDescription(data.description)
+        setQuestions(
+          data.questions.map((q) => ({
+            type: q.type,
+            title: q.title,
+            required: q.required,
+            position: q.position,
+            options: q.options.map((o) => ({
+              label: o.label,
+              position: o.position,
+            })),
+          }))
+        )
+      } catch {
+        setError("Failed to load form.")
+      } finally {
+        setLoadingForm(false)
+      }
+    }
+    fetchForm()
+  }, [id, authLoading, user])
+
+  if (authLoading || !user) return null
+
+  if (loadingForm) {
+    return (
+      <div className="flex min-h-screen items-center justify-center bg-background">
+        <p className="text-muted-foreground">Loading form...</p>
+      </div>
+    )
+  }
+
+  async function handleSubmit(e: React.FormEvent) {
+    e.preventDefault()
+    setError(null)
+
+    if (!title.trim()) {
+      setError("Form title is required.")
+      return
+    }
+
+    const hasEmptyQuestion = questions.some((q) => !q.title.trim())
+    if (hasEmptyQuestion) {
+      setError("All questions must have a title.")
+      return
+    }
+
+    const hasEmptyOption = questions.some(
+      (q) =>
+        TYPES_WITH_OPTIONS.includes(q.type) &&
+        (q.options.length === 0 || q.options.some((o) => !o.label.trim()))
+    )
+    if (hasEmptyOption) {
+      setError("All options must have a label.")
+      return
+    }
+
+    setSubmitting(true)
+    try {
+      await updateForm(id!, {
+        title: title.trim(),
+        description: description.trim(),
+        questions,
+      })
+      navigate(`/form/${id}`)
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Failed to update form.")
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <div className="flex min-h-screen flex-col bg-background">
+      <Navbar />
+
+      <main className="flex-1">
+        <div className="mx-auto max-w-3xl px-4 py-8 lg:px-8">
+          <Link
+            to={`/form/${id}`}
+            className="mb-6 inline-flex items-center gap-1.5 text-sm font-medium text-muted-foreground transition-colors hover:text-foreground"
+          >
+            <ArrowLeft className="h-4 w-4" />
+            Back to form
+          </Link>
+
+          <h1 className="mb-6 text-2xl font-bold text-foreground">
+            Edit Form
+          </h1>
+
+          <form onSubmit={handleSubmit}>
+            {error && (
+              <div className="mb-6 rounded-lg bg-destructive/10 px-4 py-3 text-sm text-destructive">
+                {error}
+              </div>
+            )}
+
+            <div className="mb-8 rounded-xl border border-border bg-card p-6 shadow-sm">
+              <div className="h-2 -mx-6 -mt-6 mb-6 rounded-t-xl bg-primary" />
+              <div className="flex flex-col gap-4">
+                <FormInput
+                  label="Form Title"
+                  placeholder="Enter form title"
+                  value={title}
+                  onChange={(e) => setTitle(e.target.value)}
+                  required
+                />
+                <div className="flex flex-col gap-1.5">
+                  <label className="text-sm font-medium text-foreground">
+                    Description
+                  </label>
+                  <textarea
+                    placeholder="Enter form description"
+                    value={description}
+                    onChange={(e) => setDescription(e.target.value)}
+                    rows={3}
+                    className="rounded-lg border border-input bg-card px-3.5 py-2.5 text-sm text-foreground placeholder:text-muted-foreground outline-none transition-colors focus:border-primary focus:ring-2 focus:ring-primary/20 resize-none"
+                  />
+                </div>
+              </div>
+            </div>
+
+            <QuestionEditor questions={questions} onChange={setQuestions} />
+
+            <div className="mt-8 flex items-center justify-end gap-3">
+              <Link to={`/form/${id}`}>
+                <FormButton type="button" variant="ghost" size="md">
+                  Cancel
+                </FormButton>
+              </Link>
+              <FormButton type="submit" size="md" disabled={submitting}>
+                {submitting ? "Saving..." : "Save Changes"}
+              </FormButton>
+            </div>
+          </form>
+        </div>
+      </main>
+
+      <Footer />
+    </div>
+  )
+}