--- ./dialogs/keyboard-settings/xfce-keyboard-settings.c.orig	2010-01-02 07:31:06.000000000 -0600
+++ ./dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-02-12 02:11:05.000000000 -0600
@@ -457,7 +457,7 @@
 
 #ifdef HAVE_LIBXKLAVIER
   /* Stop xklavier engine */
-  xkl_engine_stop_listen (settings->priv->xkl_engine);
+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
 #endif /* HAVE_LIBXKLAVIER */
 
   g_object_unref (settings->priv->provider);