diff --git a/editions/tour/tiddlers/System/configAutoStartTour.tid b/editions/tour/tiddlers/System/configAutoStartTour.tid
new file mode 100644
index 000000000..6bafd6d58
--- /dev/null
+++ b/editions/tour/tiddlers/System/configAutoStartTour.tid
@@ -0,0 +1,2 @@
+title: $:/config/AutoStartTour
+text: yes
diff --git a/plugins/tiddlywiki/tour/config-AutoStartTour.tid b/plugins/tiddlywiki/tour/config-AutoStartTour.tid
new file mode 100644
index 000000000..ba598fd0e
--- /dev/null
+++ b/plugins/tiddlywiki/tour/config-AutoStartTour.tid
@@ -0,0 +1,2 @@
+title: $:/config/AutoStartTour
+text: no
diff --git a/plugins/tiddlywiki/tour/config-ShowTour.tid b/plugins/tiddlywiki/tour/config-ShowTour.tid
new file mode 100644
index 000000000..44ed4339f
--- /dev/null
+++ b/plugins/tiddlywiki/tour/config-ShowTour.tid
@@ -0,0 +1,2 @@
+title: $:/config/ShowTour
+text: hide
diff --git a/plugins/tiddlywiki/tour/globals.tid b/plugins/tiddlywiki/tour/globals.tid
index a0e93d450..190d79ddc 100644
--- a/plugins/tiddlywiki/tour/globals.tid
+++ b/plugins/tiddlywiki/tour/globals.tid
@@ -7,9 +7,13 @@ The following state tiddlers control the tour. They should not be directly modif
 but rather use the appropriate procedure to ensure that all the associated actions are performed.
 
 $:/config/CurrentTour: title of current tour definition tiddler
-$:/config/ShowTour: "show" (default) or "hide"
 $:/state/tour/step: title of current step of the tour
 
+These config tiddlers may be changed directly as required:
+
+$:/config/ShowTour: "show" (default) or "hide"
+$:/config/AutoStartTour: "no" (default) or "yes"
+
 Tour definition tiddlers have the following fields:
 
 tags: must include $:/tags/Tour
diff --git a/plugins/tiddlywiki/tour/startup-actions.tid b/plugins/tiddlywiki/tour/startup-actions.tid
index afe83faa5..fe24deff3 100644
--- a/plugins/tiddlywiki/tour/startup-actions.tid
+++ b/plugins/tiddlywiki/tour/startup-actions.tid
@@ -1,4 +1,9 @@
 title: $:/plugins/tiddlywiki/tour/startup-actions
 tags: $:/tags/StartupAction
 
+\import [subfilter{$:/core/config/GlobalImportFilter}]
+<$action-log message="Outside"/>
+<$list filter="[[$:/config/AutoStartTour]get[text]else[no]match[yes]]" variable="ignore">
+<$action-log message="Inside"/>
 <<tour-restart>>
+</$list>