diff --git a/js/ui/main.js b/js/ui/main.js
index bf7b6acc1..979fcefa5 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -293,8 +293,7 @@ function _initializeUI() {
         if (credentials.get_unix_user() === 0) {
             notify(_('Logged in as a privileged user'),
                    _('Running a session as a privileged user should be avoided for security reasons. If possible, you should log in as a normal user.'));
-        } else if (sessionMode.currentMode !== 'gdm' &&
-                   sessionMode.currentMode !== 'initial-setup') {
+        } else if (sessionMode.showWelcomeDialog) {
             _handleShowWelcomeScreen();
         }
 
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 2136e948f..aa69fd115 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -19,6 +19,7 @@ const _modes = {
         themeResourceName: 'gnome-shell-theme.gresource',
         hasOverview: false,
         showCalendarEvents: false,
+        showWelcomeDialog: false,
         allowSettings: false,
         allowExtensions: false,
         allowScreencast: false,
@@ -70,6 +71,7 @@ const _modes = {
     'user': {
         hasOverview: true,
         showCalendarEvents: true,
+        showWelcomeDialog: true,
         allowSettings: true,
         allowExtensions: true,
         allowScreencast: true,