diff --git a/core/ui/PageControls.tid b/core/ui/PageControls.tid
new file mode 100644
index 000000000..6e9e04138
--- /dev/null
+++ b/core/ui/PageControls.tid
@@ -0,0 +1,13 @@
+title: $:/core/ui/PageTemplate/pagecontrols
+
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
+<div class="tc-page-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+<$reveal type="nomatch" state=<<config-title>> text="hide">
+<$transclude tiddler=<<listItem>> mode="inline"/>
+</$reveal>
+</$list>
+</div>
+
diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index d1e32da5a..5824eddf0 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -1,9 +1,6 @@
 title: $:/core/ui/PageTemplate/sidebar
 tags: $:/tags/PageTemplate
 
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
 <$scrollable fallthrough="no" class="tc-sidebar-scrollable">
 
 <div class="tc-sidebar-header">
@@ -22,13 +19,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 
 </div>
 
-<div class="tc-page-controls">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-<$reveal type="nomatch" state=<<config-title>> text="hide">
-<$transclude tiddler=<<listItem>> mode="inline"/>
-</$reveal>
-</$list>
-</div>
+{{$:/core/ui/PageTemplate/pagecontrols}}
 
 <$transclude tiddler="$:/core/ui/SideBarLists" mode="inline"/>