diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 605af3b56..226ec9b7b 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -913,7 +913,7 @@ var Keyboard = new Lang.Class({
 
     _onKeyboardGroupsChanged: function(keyboard) {
         this._groups = [];
-        this._addKeys();
+        this._onGroupChanged();
     },
 
     _onKeyboardStateChanged: function(controller, state) {