diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index a67d08f1e..64054208c 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1519,6 +1519,12 @@ var Keyboard = class Keyboard {
     _setActiveLayer(activeLevel) {
         let activeGroupName = this._keyboardController.getCurrentGroup();
         let layers = this._groups[activeGroupName];
+        let currentPage = layers[activeLevel];
+
+        if (this._current_page == currentPage) {
+            this._updateCurrentPageVisible();
+            return;
+        }
 
         if (this._current_page != null) {
             this._setCurrentLevelLatched(this._current_page, false);
@@ -1527,7 +1533,7 @@ var Keyboard = class Keyboard {
             delete this._current_page._destroyID;
         }
 
-        this._current_page = layers[activeLevel];
+        this._current_page = currentPage;
         this._current_page._destroyID = this._current_page.connect('destroy', () => {
             this._current_page = null;
         });