diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 8f8397b035..e9f5bacc19 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -108,12 +108,18 @@ tags: $:/tags/Macro
 
 \widget $palette.preview(paletteTitle)
 	\whitespace trim
-	\function colour-inner-get-imported-palette(name,paletteTitle)
-	[[palette-import@]addsuffix<scheme>] :map[<paletteTitle>get<currentTiddler>has[title]] +[!match[]] :else[<paletteTitle>get[palette-import]has[title]] :map[function[colour-inner-get-palette-entry],<name>,<currentTiddler>] +[!match[]] 
+	<!-- The exclusions parameter guards against palettes that import each other in a loop -->
+	\function colour-inner-get-imported-palette(name,paletteTitle,exclusions)
+	[[palette-import@]addsuffix<scheme>] :map[<paletteTitle>get<currentTiddler>has[title]] +[!match[]] :else[<paletteTitle>get[palette-import]has[title]] +[!match[]] :filter[enlist<exclusions>match<currentTiddler>count[]compare:number:eq[0]] :map[function[colour-inner-descend-imported-palette],<name>,<currentTiddler>,<exclusions>,<paletteTitle>] +[!match[]] 
 	\end colour-inner-get-imported-palette
 
-	\function colour-inner-get-palette-entry(name,paletteTitle)
-	[<name>addprefix[@]addprefix<scheme>] :map[<paletteTitle>getindex<currentTiddler>] +[!match[]] :else[<paletteTitle>getindex<name>] :map[tf.colour-inner-transform-classic-palette-entry<currentTiddler>] :else[function[colour-inner-get-imported-palette],<name>,<paletteTitle>]
+	<!-- Helper to extend the exclusions list with the parent palette before descending -->
+	\function colour-inner-descend-imported-palette(name,paletteTitle,exclusions,parentTitle)
+	[enlist<exclusions>] [<parentTitle>] +[format:titlelist[]join[ ]] :map[function[colour-inner-get-palette-entry],<name>,<paletteTitle>,<currentTiddler>]
+	\end colour-inner-descend-imported-palette
+
+	\function colour-inner-get-palette-entry(name,paletteTitle,exclusions)
+	[<name>addsuffix[@]addsuffix<scheme>] :map[<paletteTitle>getindex<currentTiddler>] +[!match[]] :else[<paletteTitle>getindex<name>] :map[tf.colour-inner-transform-classic-palette-entry<currentTiddler>] :else[function[colour-inner-get-imported-palette],<name>,<paletteTitle>,<exclusions>]
 	\end colour-inner-get-palette-entry
 
 	<!-- Note the join, needed to cope with palette entries containing spaces -->
diff --git a/editions/test/tiddlers/tests/data/palettes/PreviewCyclicImports.tid b/editions/test/tiddlers/tests/data/palettes/PreviewCyclicImports.tid
new file mode 100644
index 0000000000..960d8ae1e1
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/palettes/PreviewCyclicImports.tid
@@ -0,0 +1,39 @@
+title: Operators/Palettes/PreviewCyclicImports
+description: The palette.preview widget copes with palettes that import each other in a circular loop
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\import [subfilter{$:/core/config/GlobalImportFilter}]
+<$palette.preview paletteTitle="PaletteA">
+<<colour local>>
+<<colour inherited>>
+<<colour missing>>
+</$palette.preview>
++
+title: PaletteA
+name: Palette A
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+palette-import: PaletteB
+color-scheme: light
+
+local: #111111
++
+title: PaletteB
+name: Palette B
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+palette-import: PaletteA
+color-scheme: light
+
+inherited: #222222
++
+title: ExpectedResult
+
+<p>
+#111111
+#222222
+
+</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/palettes/PreviewSchemeLookup.tid b/editions/test/tiddlers/tests/data/palettes/PreviewSchemeLookup.tid
new file mode 100644
index 0000000000..1fde23226a
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/palettes/PreviewSchemeLookup.tid
@@ -0,0 +1,30 @@
+title: Operators/Palettes/PreviewSchemeLookup
+description: The palette.preview widget resolves scheme-suffixed entries
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\import [subfilter{$:/core/config/GlobalImportFilter}]
+<$palette.preview paletteTitle="MyPalette">
+<<colour page-background>>
+<<colour only-dark>>
+</$palette.preview>
++
+title: MyPalette
+name: My Palette
+description: Palette with scheme-suffixed entries
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+color-scheme: dark
+
+page-background: #fe0
+page-background@dark: #221
+only-dark@dark: #123
++
+title: ExpectedResult
+
+<p>
+#221
+#123
+</p>
\ No newline at end of file