diff -p -up xfce4-settings-4.6.4/dialogs/keyboard-settings/xfce-keyboard-settings.c~ xfce4-settings-4.6.4/dialogs/keyboard-settings/xfce-keyboard-settings.c
--- xfce4-settings-4.6.4/dialogs/keyboard-settings/xfce-keyboard-settings.c~	2010-01-02 14:31:06.000000000 +0100
+++ xfce4-settings-4.6.4/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-01-11 14:38:42.000000000 +0100
@@ -457,7 +457,8 @@ xfce_keyboard_settings_finalize (GObject
 
 #ifdef HAVE_LIBXKLAVIER
   /* Stop xklavier engine */
-  xkl_engine_stop_listen (settings->priv->xkl_engine);
+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_MANAGE_LAYOUTS |
+			  XKLL_MANAGE_WINDOW_STATES);
 #endif /* HAVE_LIBXKLAVIER */
 
   g_object_unref (settings->priv->provider);