diff --git a/plugins/tiddlywiki/tour/globals.tid b/plugins/tiddlywiki/tour/globals.tid
index a0cda0e42..de89cc72c 100644
--- a/plugins/tiddlywiki/tour/globals.tid
+++ b/plugins/tiddlywiki/tour/globals.tid
@@ -31,7 +31,15 @@ text: longer description of the tour
 \end
 
 \function tour-is-not-first-step()
-[all[shadows+tiddlers]tag[$:/tags/Tour/IntroductionToTiddlyWiki]before{$:/state/tour/step}count[]compare:number:gt[0]]
+[all[shadows+tiddlers]tag<tour-current-tag>before{$:/state/tour/step}count[]compare:number:gt[0]]
+\end
+
+\function tour-is-last-step()
+[all[shadows+tiddlers]tag<tour-current-tag>after{$:/state/tour/step}count[]compare:number:eq[0]]
+\end
+
+\function tour-is-not-last-step()
+[all[shadows+tiddlers]tag<tour-current-tag>after{$:/state/tour/step}count[]compare:number:gt[0]]
 \end
 
 \procedure tour-initialise-current-tour-step()
diff --git a/plugins/tiddlywiki/tour/tour-panel.tid b/plugins/tiddlywiki/tour/tour-panel.tid
index b8e3ac1f7..f9e0ccd7d 100644
--- a/plugins/tiddlywiki/tour/tour-panel.tid
+++ b/plugins/tiddlywiki/tour/tour-panel.tid
@@ -6,16 +6,26 @@ tags: $:/tags/PageTemplate
 \procedure tour-buttons()
 \procedure tv-action-refresh-policy() always
 <div class="tc-tour-panel-navigation">
-<$list filter="[function[tour-is-not-first-step]]" variable="ignore">
-<$button class="tc-btn-big-green" style="background-color: red;">
-<<tour-previous-step>>
-back
-</$button>
-</$list>
-<$button class="tc-btn-big-green" style="background-color: purple;">
-<<tour-next-step>>
-next
-</$button>
+	<$list filter="[function[tour-is-not-first-step]]" variable="ignore">
+		<$button class="tc-btn-big-green" style="background-color: red;">
+			<<tour-previous-step>>
+			back
+		</$button>
+	</$list>
+	<$list filter="[function[tour-is-not-last-step]]" variable="ignore">
+		<$button class="tc-btn-big-green" style="background-color: purple;">
+			<<tour-next-step>>
+			next
+		</$button>
+	</$list>
+	<$list filter="[function[tour-is-last-step]]" variable="ignore">
+		<$confetti/>
+		<$confetti delay=100/>
+		<$confetti delay=200/>
+		<$confetti delay=300/>
+		<$confetti delay=400/>
+		<$confetti delay=500/>
+	</$list>
 </div>
 \end
 
diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid
index 846358236..02e35f457 100644
--- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid
@@ -3,13 +3,6 @@ tags: $:/tags/Tour/IntroductionToTiddlyWiki
 
 ! Congratulations
 
-<$confetti/>
-<$confetti delay=100/>
-<$confetti delay=200/>
-<$confetti delay=300/>
-<$confetti delay=400/>
-<$confetti delay=500/>
-
 You have completed the tour.
 
 You can choose to take another tour:
diff --git a/plugins/tiddlywiki/tour/tours/using-tags/finished.tid b/plugins/tiddlywiki/tour/tours/using-tags/finished.tid
new file mode 100644
index 000000000..1942f2aea
--- /dev/null
+++ b/plugins/tiddlywiki/tour/tours/using-tags/finished.tid
@@ -0,0 +1,4 @@
+title: $:/plugins/tiddlywiki/tour/using-tags/finished
+tags: $:/tags/Tour/UsingTags
+
+! Congratulations
diff --git a/plugins/tiddlywiki/tour/tours/using-tags/tagsTourUsingTags.tid b/plugins/tiddlywiki/tour/tours/using-tags/tagsTourUsingTags.tid
index d45d0f9fc..30681ca24 100644
--- a/plugins/tiddlywiki/tour/tours/using-tags/tagsTourUsingTags.tid
+++ b/plugins/tiddlywiki/tour/tours/using-tags/tagsTourUsingTags.tid
@@ -1,2 +1,2 @@
 title: $:/tags/Tour/UsingTags
-list: $:/plugins/tiddlywiki/tour/using-tags/welcome
+list: $:/plugins/tiddlywiki/tour/using-tags/welcome $:/plugins/tiddlywiki/tour/using-tags/finished