diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index e3938d541..6e9965843 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -243,7 +243,7 @@ const InputSourceManager = new Lang.Class({
         // of pushModal/popModal and grabHelper. See
         // https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
         if (Main.actionMode == Shell.ActionMode.MESSAGE_TRAY ||
-            Main.actionMode == Shell.ActionMode.TOPBAR_POPUP) {
+            Main.actionMode == Shell.ActionMode.POPUP) {
             this._modifiersSwitcher();
             return;
         }
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index b4395c143..e0bf007aa 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -831,14 +831,14 @@ const WindowManager = new Lang.Class({
                            new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
                            Shell.ActionMode.NORMAL |
-                           Shell.ActionMode.TOPBAR_POPUP,
+                           Shell.ActionMode.POPUP,
                            Lang.bind(this, this._toggleAppMenu));
 
         this.addKeybinding('toggle-message-tray',
                            new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
                            Shell.ActionMode.NORMAL |
-                           Shell.ActionMode.TOPBAR_POPUP,
+                           Shell.ActionMode.POPUP,
                            Lang.bind(this, this._toggleCalendar));
 
         global.display.connect('show-resize-popup', Lang.bind(this, this._showResizePopup));