diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 70101e93d..4cb0c6e91 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1505,10 +1505,14 @@ export const Keyboard = GObject.registerClass({
                         this._disableAllModifiers();
                         if (layout.mode === 'default' ||
                             (layout.mode === 'latched' && !this._latched)) {
-                            if (this._contentHint !== 0)
+                            if (this._contentHint !== 0) {
+                                if (layout.mode === 'latched' && !this._latched)
+                                    this._setActiveLevel('default');
+
                                 this._updateLevelFromHints();
-                            else
+                            } else {
                                 this._setActiveLevel('default');
+                            }
                         }
                     }).catch(console.error);
                 });