diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index e7d0176dc..e029d0a7f 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1533,7 +1533,10 @@ export const Keyboard = GObject.registerClass({
 
             if (key.action !== 'modifier') {
                 button.connect('commit', (_actor, keyval, str) => {
-                    this._commitAction(keyval, str);
+                    this._commitAction(keyval, str).then(() => {
+                        if (!this._latched)
+                            this._setActiveLayer(0);
+                    });
                 });
             }
 
@@ -1613,9 +1616,6 @@ export const Keyboard = GObject.registerClass({
                 });
             }
         }
-
-        if (!this._latched)
-            this._setActiveLayer(0);
     }
 
     _previousWordPosition(text, cursor) {