diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
index 2ceaab7c4..1c420e963 100644
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -21,7 +21,7 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 
 <!-- clean up temporary tiddlers, so the next "pick" starts with a clean input -->
 <!-- This could probably be optimized / removed if we would use different temp-tiddlers
-	(future improvement because keeping track is comlex for humans)
+	(future improvement because keeping track is complex for humans)
 -->
 \procedure delete-tag-state-tiddlers()
 <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
@@ -111,6 +111,7 @@ The second ESC tries to close the "draft tiddler"
 				refreshTitle=<<refreshTitle>>
 				selectionStateTitle=<<tagSelectionState>>
 				inputAcceptActions=<<add-tag-actions>>
+				inputAcceptVariantActions=<<save-tiddler-actions>>
 				inputCancelActions=<<clear-tags-actions>>
 				tag="input"
 				placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
diff --git a/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9600.tid b/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9600.tid
new file mode 100644
index 000000000..3ec2e5daf
--- /dev/null
+++ b/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9600.tid
@@ -0,0 +1,10 @@
+title: $:/changenotes/5.4.0/#9600
+description: Fix Ctrl-Enter not working in EditTemplate tag name input
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: bugfix
+change-category: internal
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9600
+github-contributors: yaisog
+
+The tag name input now calls `<<save-tiddler-actions>>` from the EditTemplate when Ctrl-Enter (or whichever key is assigned to input-accept-variant) is pressed.