diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index d6434c4d1..28457d0ab 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -2,18 +2,18 @@ title: $:/TagManager
 
 \define lingo-base() $:/language/TagManager/
 \define iconEditor(title)
+<div class="tw-drop-down-wrapper">
 <$edit-text field="icon" tag="input" size="20"/> <$button popup=<<qualify "$:/state/popup/icon/$title$">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button>
-<div class="tw-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="nomatch" text="" default="">
+<$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="popup" position="belowleft" text="" default="">
+<div class="tw-drop-down">
 <$linkcatcher to="$title$!!icon">
-<div class="tw-block-dropdown tw-edit-type-dropdown">
-<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] +[sort[title]]">
+<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]]">
 <$link to={{!!title}}>
-<$view field="title"/>
+<$transclude/> <$view field="title"/>
 </$link>
 </$list>
-</div>
 </$linkcatcher>
+</div>
 </$reveal>
 </div>
 \end
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 28a9309e7..6732b9162 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -855,6 +855,10 @@ canvas.tw-edit-bitmapeditor  {
 	fill: <<colour muted-foreground>>;
 }
 
+.tw-drop-down-wrapper {
+	position: relative;
+}
+
 .tw-drop-down {
 	min-width: 280px;
 	border: 1px solid <<colour dropdown-border>>;