diff --git a/core/ui/PaletteManager.tid b/core/ui/PaletteManager.tid
index c39bbee45..ae91d9ccc 100644
--- a/core/ui/PaletteManager.tid
+++ b/core/ui/PaletteManager.tid
@@ -65,14 +65,10 @@ title: $:/PaletteManager
\whitespace trim
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" variable="colourName">
-<$list
- filter="[indexes[]removeprefixsuffix[]]"
- variable="ignore"
- emptyMessage="<$list filter='[{$:/state/palettemanager/showexternal}removeprefix[yes]suffix[]]' variable='ignore'><>$list>">
-<>
-$list>
-$list>
+<$set name="colorList" filter="[{$:/state/palettemanager/showexternal}match[yes]]"
+ value="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" emptyValue="[indexes[]]">
+<$list filter=<> variable="colourName"> <> $list>
+$set>
\end