diff --git a/core/ui/MoreSideBar.tid b/core/ui/MoreSideBar.tid
index 2b01d4bc5..0c6aabe9b 100644
--- a/core/ui/MoreSideBar.tid
+++ b/core/ui/MoreSideBar.tid
@@ -8,8 +8,6 @@ title: $:/core/ui/MoreSideBar
 
 <$button type="set" set="$:/state/moreSideBarTabSet" setTo="tagsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tags</$button>
 
-<$button type="set" set="$:/state/moreSideBarTabSet" setTo="untaggedTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Untagged</$button>
-
 <$button type="set" set="$:/state/moreSideBarTabSet" setTo="missingTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Missing</$button>
 
 <$button type="set" set="$:/state/moreSideBarTabSet" setTo="draftsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Drafts</$button>
@@ -33,9 +31,8 @@ title: $:/core/ui/MoreSideBar
 <$list filter="[tags[]sort[title]]" itemClass="tw-menu-list-item">
 <$transclude title="$:/core/ui/TagTemplate"/> <small class="tw-menu-list-count"><$count filter="[is[current]tagging[]]"/></small>
 </$list>
-</$reveal>
-<$reveal type="match" state="$:/state/moreSideBarTabSet" text="untaggedTab" qualifyTiddlerTitles="yes">
-<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" itemClass="tw-menu-list-item"/>
+----
+{{$:/core/ui/UntaggedTemplate}} <small class="tw-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
 </$reveal>
 <$reveal type="match" state="$:/state/moreSideBarTabSet" text="missingTab" qualifyTiddlerTitles="yes">
 <$list filter="[is[missing]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/MissingTemplate"/>
diff --git a/core/ui/UntaggedTemplate.tid b/core/ui/UntaggedTemplate.tid
new file mode 100644
index 000000000..80a63313e
--- /dev/null
+++ b/core/ui/UntaggedTemplate.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/UntaggedTemplate
+
+<$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-untagged-label tw-tag-label">untagged</$button>
+<$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">
+<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]">
+<$view field="title" format="link" />
+</$list>
+</div></$reveal>
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 175a5605a..1a9fc23c6 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -289,6 +289,10 @@ a.tw-tiddlylink-external {
 	<<border-radius 8px>>
 }
 
+.tw-untagged-label {
+	background-color: #999;
+}
+
 .tw-tag-label svg {
 	height: 1em;
 	width: 1em;