diff --git a/core/ui/PageControls.tid b/core/ui/PageControls.tid
index b12fc5203..31df286fe 100644
--- a/core/ui/PageControls.tid
+++ b/core/ui/PageControls.tid
@@ -1,15 +1,17 @@
 title: $:/core/ui/PageTemplate/pagecontrols
 
+\whitespace trim
 \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">
+<$set name="hidden" value=<<config-title>>>
+<$list filter="[<hidden>!text[hide]]" storyview="pop">
 <$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
 <$transclude tiddler=<<listItem>> mode="inline"/>
 </$set>
-</$reveal>
+</$list>
+</$set>
 </$list>
 </div>
-