diff --git a/internal/web/fillup.go b/internal/web/fillup.go
index 4bfa36a..3e41aa2 100644
--- a/internal/web/fillup.go
+++ b/internal/web/fillup.go
@@ -315,8 +315,14 @@ func (s *Server) adminFillupApply(w http.ResponseWriter, r *http.Request) {
 		}
 
 		for _, pid := range ids {
-			// 框里填的是**活动名**：对得上就用现有的，对不上就新建一个
-			if name := strings.TrimSpace(r.PostFormValue("act_" + strconv.FormatInt(pid, 10))); name != "" {
+			// 框里填的是**活动名**：对得上就用现有的，对不上就新建一个。
+			// 下拉选了「其它（自己写）」时，真正要读的是旁边那个文本框——与类别同一套写法。
+			actKey := "act_" + strconv.FormatInt(pid, 10)
+			actName := strings.TrimSpace(r.PostFormValue(actKey))
+			if actName == "__custom__" {
+				actName = strings.TrimSpace(r.PostFormValue(actKey + "__custom"))
+			}
+			if name := actName; name != "" {
 				actID, ok := actByName[name]
 				if !ok {
 					pk, err := s.nextSrcPK(ctx, ex, ds.ID, activitySeq)
diff --git a/internal/web/fillup_test.go b/internal/web/fillup_test.go
index a4a4932..d728505 100644
--- a/internal/web/fillup_test.go
+++ b/internal/web/fillup_test.go
@@ -266,3 +266,38 @@ func TestFillupCustomCategoryEmptyIsSkipped(t *testing.T) {
 		t.Fatalf("没填内容时不该写库，实际 %q", got)
 	}
 }
+
+// 活动下拉选「其它（自己写）」时，读的是旁边文本框里的名字——与类别同一套写法。
+func TestFillupCustomActivity(t *testing.T) {
+	f := newMovementFixture(t)
+	placeID, _ := fillupPlace(t, f)
+	key := "act_" + strconv.FormatInt(placeID, 10)
+
+	applyFillup(t, f, url.Values{key: {"__custom__"}, key + "__custom": {"爬山"}})
+
+	var got string
+	if err := f.pg.QueryRowContext(f.ctx, `SELECT a.name FROM visits v JOIN activities a ON a.id=v.activity_id
+		WHERE v.dataset_id=$1 AND v.place_id=$2 LIMIT 1`, f.dsID, placeID).Scan(&got); err != nil {
+		t.Fatalf("读活动失败: %v", err)
+	}
+	if got != "爬山" {
+		t.Fatalf("应写入手工填的活动名，实际 %q", got)
+	}
+	t.Cleanup(func() {
+		f.pg.ExecContext(f.ctx, `DELETE FROM activities WHERE dataset_id=$1 AND name=$2`, f.dsID, "爬山")
+	})
+}
+
+// 选了「其它」却没写名字：什么都不做，别建一个空名活动。
+func TestFillupCustomActivityEmptyIsSkipped(t *testing.T) {
+	f := newMovementFixture(t)
+	placeID, _ := fillupPlace(t, f)
+	key := "act_" + strconv.FormatInt(placeID, 10)
+	before := f.scalar(t, `SELECT count(*) FROM activities WHERE dataset_id=$1`, f.dsID)
+
+	applyFillup(t, f, url.Values{key: {"__custom__"}, key + "__custom": {"  "}})
+
+	if n := f.scalar(t, `SELECT count(*) FROM activities WHERE dataset_id=$1`, f.dsID); n != before {
+		t.Fatalf("没填名字不该建类型，活动数 %d → %d", before, n)
+	}
+}
diff --git a/internal/web/templates/admin/fillup.html b/internal/web/templates/admin/fillup.html
index 3d93760..e0ee1a3 100644
--- a/internal/web/templates/admin/fillup.html
+++ b/internal/web/templates/admin/fillup.html
@@ -52,14 +52,21 @@
               <td data-label="缺什么">{{$row.Missing}}</td>
               <td data-label="活动">
                 {{if $row.NoAct}}
-                <input list="fill-act" name="act_{{$row.PlaceID}}" value=""
-                       placeholder="（不动）" data-hint="{{$row.ActHint}}" style="min-width:8em">
+                {{$ahint := $row.ActHint}}
+                <select name="act_{{$row.PlaceID}}" class="fill-sel" data-hint="{{$ahint}}" style="min-width:10em">
+                  <option value="">（不动）</option>
+                  {{if $ahint}}<option value="{{$ahint}}">建议：{{$ahint}}</option>{{end}}
+                  {{range $.Activities}}{{if ne .Name $ahint}}<option value="{{.Name}}">{{.Name}}</option>{{end}}{{end}}
+                  <option value="__custom__">其它（自己写）…</option>
+                </select>
+                <input type="text" name="act_{{$row.PlaceID}}__custom" placeholder="例如 爬山"
+                       style="display:none;margin-top:4px;min-width:10em">
                 {{else}}<span class="muted">—</span>{{end}}
               </td>
               <td data-label="类别">
                 {{if $row.NoCat}}
                 {{$hint := $row.CatHint}}
-                <select name="cat_{{$row.PlaceID}}" class="cat-sel" data-hint="{{$hint}}">
+                <select name="cat_{{$row.PlaceID}}" class="fill-sel" data-hint="{{$hint}}" style="min-width:10em">
                   <option value="">（不动）</option>
                   {{if $hint}}<option value="{{$hint}}">建议：{{catName $hint}}</option>{{end}}
                   {{range $.Categories}}{{if ne .Value $hint}}<option value="{{.Value}}">{{.Label}}</option>{{end}}{{end}}
@@ -103,16 +110,12 @@
   {{end}}
 </div>
 
-<datalist id="fill-act">
-  {{range .Activities}}<option value="{{.Name}}"></option>{{end}}
-</datalist>
-
 <script>
 (function () {
   var KEY = 'rond-fillup-draft';
 
-  // 选了「其它（自己写）」就露出旁边的文本框
-  document.querySelectorAll('select.cat-sel').forEach(function (sel) {
+  // 活动和类别是同一套下拉：选了「其它（自己写）」就露出旁边的文本框
+  document.querySelectorAll('select.fill-sel').forEach(function (sel) {
     var box = document.querySelector('input[name="' + sel.name + '__custom"]');
     if (!box) return;
     var sync = function () {
@@ -124,17 +127,12 @@
     sync();
   });
 
-  // 采纳本页建议：活动按 data-hint 填进输入框，类别把建议项选上
+  // 采纳本页建议：把建议项选上（活动和类别都是下拉）
   var pick = document.getElementById('pick-hints');
   if (pick) {
     pick.addEventListener('click', function () {
       var n = 0;
-      document.querySelectorAll('input[name^="act_"]').forEach(function (inp) {
-        if (inp.value || !inp.dataset.hint) return;
-        inp.value = inp.dataset.hint;
-        n++;
-      });
-      document.querySelectorAll('select.cat-sel').forEach(function (sel) {
+      document.querySelectorAll('select.fill-sel').forEach(function (sel) {
         if (sel.value || !sel.dataset.hint) return;
         sel.value = sel.dataset.hint;
         n++;
@@ -147,7 +145,7 @@
   // 否则挑了半天，点一下就全没了。
   var save = function () {
     var draft = {};
-    document.querySelectorAll('input[name^="act_"], input[name$="__custom"], select.cat-sel').forEach(function (el) {
+    document.querySelectorAll('select.fill-sel, input[name$="__custom"]').forEach(function (el) {
       if (el.value) draft[el.name] = el.value;
     });
     try { sessionStorage.setItem(KEY, JSON.stringify(draft)); } catch (e) { /* 隐私模式就算了 */ }