diff --git a/core/ui/Manager.tid b/core/ui/Manager.tid
index de4a972a8..941ece4d7 100644
--- a/core/ui/Manager.tid
+++ b/core/ui/Manager.tid
@@ -20,7 +20,7 @@ color: #bbb
 
 \define list-item-content-item()
 <div class="tc-manager-list-item-content-item">
-	<$vars state-title=<<qualify "$:/state/popup/manager/item/$(listItem)$">>>
+	<$vars state-title="""$:/state/popup/manager/item/$(listItem)$""">
 		<$reveal state=<<state-title>> type="match" text="show" default="show" tag="div">
 			<$button set=<<state-title>> setTo="hide" class="tc-btn-invisible tc-manager-list-item-content-item-heading">
 				{{$:/core/images/down-arrow}} <$transclude tiddler=<<listItem>> field="caption"/>
@@ -81,12 +81,7 @@ color: #bbb
 		</div>
 		<div class="tc-manager-control">
 			<$checkbox tiddler="$:/config/Manager/System" field="text" checked="" unchecked="system" default="system">
-				Show system tiddlers
-			</$checkbox>
-		</div>
-		<div class="tc-manager-control">
-			<$checkbox tiddler="$:/config/Manager/View" field="text" checked="plain" unchecked="wikified" default="wikified">
-				Show raw text
+				Include system tiddlers
 			</$checkbox>
 		</div>
 	</div>
diff --git a/core/wiki/config/ManagerItemState.multids b/core/wiki/config/ManagerItemState.multids
new file mode 100644
index 000000000..845034ff6
--- /dev/null
+++ b/core/wiki/config/ManagerItemState.multids
@@ -0,0 +1,3 @@
+title: $:/state/popup/manager/item/$:/Manager/
+
+ItemMain/RawText: hide
\ No newline at end of file
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index a02b8f521..48f6153b3 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1770,6 +1770,9 @@ html body.tc-body.tc-single-tiddler-window {
 
 .tc-manager-list-item-heading-selected {
 	font-weight: bold;
+	color: <<colour background>>;
+	fill: <<colour background>>;
+	background-color: <<colour foreground>>;
 }
 
 .tc-manager-list-item-heading:hover {