diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 3967131..6c4d551 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -330,8 +330,10 @@ xkb_config_set_group (gint group)
 gboolean
 xkb_config_next_group (void)
 {
-    xkl_engine_lock_group (config->engine,
-            xkl_engine_get_next_group (config->engine));
+    gint new_group;
+    new_group = xkl_engine_get_next_group (config->engine);
+    xkl_engine_lock_group (config->engine, new_group);
+    config->current_group = new_group;
 
     return TRUE;
 }
@@ -339,8 +341,10 @@ xkb_config_next_group (void)
 gboolean
 xkb_config_prev_group (void)
 {
-    xkl_engine_lock_group (config->engine,
-            xkl_engine_get_prev_group (config->engine));
+    gint new_group;
+    new_group = xkl_engine_get_prev_group (config->engine);
+    xkl_engine_lock_group (config->engine, new_group);
+    config->current_group = new_group;
 
     return TRUE;
 }