diff --git a/core/ui/TopRightBar/menu.tid b/core/ui/TopRightBar/menu.tid
index 73929eee0..318a35b31 100644
--- a/core/ui/TopRightBar/menu.tid
+++ b/core/ui/TopRightBar/menu.tid
@@ -1,9 +1,9 @@
 title: $:/core/ui/TopBar/menu
 tags: $:/tags/TopRightBar
 
-<$reveal state="$:/state/sidebar" type="nomatch" text="no">
+<$list filter="[[$:/state/sidebar]get[text]!match[no]]" variable="ignore">
 <$button set="$:/state/sidebar" setTo="no" tooltip={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-right}}</$button>
-</$reveal>
-<$reveal state="$:/state/sidebar" type="match" text="no">
+</$list>
+<$list filter="[[$:/state/sidebar]get[text]match[no]]" variable="ignore">
 <$button set="$:/state/sidebar" setTo="yes" tooltip={{$:/language/Buttons/ShowSideBar/Hint}} aria-label={{$:/language/Buttons/ShowSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-left}}</$button>
-</$reveal>
+</$list>
diff --git a/plugins/tiddlywiki/help/help.tid b/plugins/tiddlywiki/help/help.tid
index e2e7e9f0b..345a528fb 100644
--- a/plugins/tiddlywiki/help/help.tid
+++ b/plugins/tiddlywiki/help/help.tid
@@ -6,7 +6,7 @@ description: {{$:/language/Buttons/Help/Hint}}
 \whitespace trim
 \define help-inner()
 \whitespace trim
-<$reveal type="match" state="$:/config/ShowHelp" text="yes">
+<$list filter="[[$:/config/ShowHelp]get[text]match[yes]]" variable="ignore">
 <$button set="$:/config/ShowHelp" setTo="no" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class="""$(tv-config-toolbar-class)$ tc-selected""">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/help}}
@@ -15,8 +15,8 @@ description: {{$:/language/Buttons/Help/Hint}}
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Help/Caption}}/></span>
 </$list>
 </$button>
-</$reveal>
-<$reveal type="nomatch" state="$:/config/ShowHelp" text="yes">
+</$list>
+<$list filter="[[$:/config/ShowHelp]get[text]!match[yes]]" variable="ignore">
 <$button set="$:/config/ShowHelp" setTo="yes" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/help}}
@@ -25,6 +25,6 @@ description: {{$:/language/Buttons/Help/Hint}}
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Help/Caption}}/></span>
 </$list>
 </$button>
-</$reveal>
+</$list>
 \end
 <<help-inner>>