diff --git a/ChangeLog b/ChangeLog
index dc1c60f5..8a41c914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Enrico Tröger  <enrico.troeger@uvena.de>
+
+ * src/callbacks.c: Applied patch from Củ Văn Chuối to re-enable
+                    XIM support. Thanks!
+
+
 2006-08-07  Nick Treleaven  <nick.treleaven@btinternet.com>
 
  * src/callbacks.c: Allow Find even when the replace text is the same.
diff --git a/src/callbacks.c b/src/callbacks.c
index fb9dcf0d..7f1f53b9 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1020,7 +1020,7 @@ on_window_key_press_event              (GtkWidget *widget,
                                         GdkEventKey *event,
                                         gpointer user_data)
 {
-	return keybindings_got_event(widget, event, user_data);
+	return event->keyval == 0 ? FALSE : keybindings_got_event(widget, event, user_data);
 }