diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 07653da33..1ba74c687 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -5,10 +5,12 @@ tw-tiddler-frame tw-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerCl
 \end
 <div class=<<frame-classes>>>
 <$set name="storyTiddler" value=<<currentTiddler>>>
+<$keyboard key="escape" message="tw-cancel-tiddler">
 <$keyboard key="ctrl+enter" message="tw-save-tiddler">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>
 </$keyboard>
+</$keyboard>
 </$set>
 </div>