diff --git a/appview/pages/templates/repo/fork.html b/appview/pages/templates/repo/fork.html
index cb1b81b..2b1752f 100644
--- a/appview/pages/templates/repo/fork.html
+++ b/appview/pages/templates/repo/fork.html
@@ -6,6 +6,18 @@
 </div>
 <div class="p-6 bg-white dark:bg-gray-800 drop-shadow-sm rounded">
   <form hx-post="/{{ .RepoInfo.FullName }}/fork" class="space-y-12" hx-swap="none">
+    <fieldset class="space-y-3">
+      <legend class="dark:text-white">Set a name for your fork</legend>
+      <input
+        type="text"
+        id="name"
+        name="name"
+        value="{{ .RepoInfo.Name }}"
+        placeholder="repository name"
+        required
+        class="dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400"/>
+    </fieldset>
+
     <fieldset class="space-y-3">
       <legend class="dark:text-white">Select a knot to fork into</legend>
       <div class="space-y-2">
diff --git a/appview/state/repo.go b/appview/state/repo.go
index 201f8b8..156d4fe 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -1690,17 +1690,22 @@ func (s *State) ForkRepo(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		forkName := r.FormValue("name")
+		if forkName == "" {
+			s.pages.Notice(w, "repo", "Invalid form submission&mdash;missing repository name.")
+			return
+		}
+
 		ok, err := s.enforcer.E.Enforce(user.Did, knot, knot, "repo:create")
 		if err != nil || !ok {
 			s.pages.Notice(w, "repo", "You do not have permission to create a repo in this knot.")
 			return
 		}
 
-		forkName := fmt.Sprintf("%s", f.RepoName)
-
-		existingRepo, err := db.GetRepo(s.db, user.Did, f.RepoName)
+		existingRepo, err := db.GetRepo(s.db, user.Did, forkName)
 		if err == nil && existingRepo != nil {
-			forkName = fmt.Sprintf("%s-%s", forkName, randomString(3))
+			s.pages.Notice(w, "repo", "Invalid form submission&mdash;repository already exists.")
+			return
 		}
 
 		secret, err := db.GetRegistrationKey(s.db, knot)
@@ -1721,7 +1726,7 @@ func (s *State) ForkRepo(w http.ResponseWriter, r *http.Request) {
 		} else {
 			uri = "https"
 		}
-		sourceUrl := fmt.Sprintf("%s://%s/%s/%s", uri, knot, f.OwnerDid(), f.RepoName)
+		sourceUrl := fmt.Sprintf("%s://%s/%s/%s", uri, f.Knot, f.OwnerDid(), f.RepoName)
 		sourceAt := f.RepoAt.String()
 
 		rkey := s.TID()