diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 56c8d585e..05ac18a8b 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1411,8 +1411,7 @@ export const Keyboard = GObject.registerClass({
         this._keypad.hide();
         this._keypadVisible = false;
 
-        this._ensureKeysForGroup(this._keyboardController.getCurrentGroup());
-        this._setActiveLayer(0);
+        this._updateKeys();
 
         Main.inputMethod.connectObject(
             'terminal-mode-changed', this._onTerminalModeChanged.bind(this),