diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 4f715d7..e50ed3a 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -190,9 +190,6 @@ systemctl stop mdmonitor-takeover.service 2> /dev/null || :
 # don't enable the gnome-settings-daemon packagekit plugin
 gsettings set org.gnome.software download-updates 'false' || :
 
-# disable welcome tour by passing a huge version number
-gsettings set org.gnome.shell welcome-dialog-last-shown-version '4294967295' || :
-
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
 systemctl --no-reload disable crond.service 2> /dev/null || :
diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks
index 6f9f5e4..73286db 100644
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -66,6 +66,11 @@ FOE
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
   fi
 
+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
   # Copy Anaconda branding in place
   if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
     cp -a /usr/share/lorax/product/* /