diff --git a/plugins/tiddlywiki/tour/tour-panel.tid b/plugins/tiddlywiki/tour/tour-panel.tid
index d07007a63..84fd6becd 100644
--- a/plugins/tiddlywiki/tour/tour-panel.tid
+++ b/plugins/tiddlywiki/tour/tour-panel.tid
@@ -40,7 +40,12 @@ next
 					</$reveal>
 				</div>
 			</div>
-			<$transclude tiddler={{$:/state/tour/step}} mode="block"/>
+			<$let
+				currentTour={{$:/config/CurrentTour}}
+				currentTourStep={{$:/state/tour/step}}
+			>
+				<$transclude tiddler=<<currentTourStep>> mode="block"/>
+			</$let>
 			<$list filter="[{$:/state/tour/step}has[selector]]" variable="ignore">
 				<$button class="tc-btn-big-green" style="background-color: green;">
 					<$action-sendmessage $message="tm-spotlight-element" selector={{{ [{$:/state/tour/step}get[selector]] }}} selector-fallback-1={{{ [{$:/state/tour/step}get[selector-fallback-1]] }}} selector-fallback-2={{{ [{$:/state/tour/step}get[selector-fallback-2]] }}}/>
diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid
index abff6152d..665321c96 100644
--- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/finished.tid
@@ -13,4 +13,4 @@ You have completed the tour.
 
 You can choose to take another tour:
 
-<<tour-chooser filter:"[all[shadows+tiddlers]tag[$:/tags/Tour]] -[[$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki]]">>
+<<tour-chooser filter:"[all[shadows+tiddlers]tag[$:/tags/Tour]] -[<currentTour>]">>