diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
index e4a574317..f2cfd6692 100644
--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@@ -4,4 +4,8 @@ tags: $:/tags/EditTemplate
 \define config-title()
 $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \end
+<div class="tw-tiddler-title">
+<$view field="title"/>
 <span class="tw-tiddler-controls titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
+<div style="clear: both;"></div>
+</div>
diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid
index af0ebced0..6953ae072 100644
--- a/core/ui/EditTemplate/title.tid
+++ b/core/ui/EditTemplate/title.tid
@@ -1,6 +1,4 @@
 title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
-<$view field="title"/>
-
 <$edit-text field="draft.title" class="titlebar tw-edit-texteditor"/>