diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 1ec5e55ef..35843d901 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -888,8 +888,7 @@ const PopupMenuBase = new Lang.Class({
     },
 
     addSettingsAction: function(title, desktopFile) {
-        // Don't allow user settings to get edited unless we're in a user session
-        if (Main.sessionMode.sessionType != Shell.SessionType.USER)
+        if (!Main.sessionMode.allowSettings)
             return null;
 
         let menuItem = this.addAction(title, function() {
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index df2592313..257214934 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -11,11 +11,13 @@ const _modes = {
     'gdm': { hasOverview: false,
              hasAppMenu: false,
              showCalendarEvents: false,
+             allowSettings: false,
              sessionType: Shell.SessionType.GDM },
 
     'user': { hasOverview: true,
               hasAppMenu: true,
               showCalendarEvents: true,
+              allowSettings: true,
               sessionType: Shell.SessionType.USER }
 };
 
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index c5400bc6b..90dd8f6e6 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -63,7 +63,11 @@ const XKBIndicator = new Lang.Class({
 
         this._syncConfig();
 
-        if (Main.sessionMode.sessionType == Shell.SessionType.USER) {
+        // re-using "allowSettings" for the keyboard layout is a bit shady,
+        // but at least for now it is used as "allow popping up windows
+        // from shell menus"; we can always add a separate sessionMode
+        // option if need arises.
+        if (Main.sessionMode.allowSettings) {
             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
             this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
                 Main.overview.hide();
diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 07c0a1960..bc21fdf22 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -624,7 +624,8 @@ const UserMenuButton = new Lang.Class({
         let item;
 
         item = new IMStatusChooserItem();
-        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        if (Main.sessionMode.allowSettings)
+            item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
         this.menu.addMenuItem(item);
         this._statusChooser = item;
 
@@ -636,9 +637,11 @@ const UserMenuButton = new Lang.Class({
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("System Settings"));
-        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this.menu.addMenuItem(item);
+        if (Main.sessionMode.allowSettings) {
+            item = new PopupMenu.PopupMenuItem(_("System Settings"));
+            item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
+            this.menu.addMenuItem(item);
+        }
 
         item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
                                                       _("Suspend"));