diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 8dd11eaea..388dace45 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-settings-multimedia-keys.c: (acme_filter_events): make sure
+	we have a key event before treating it as such (fixes bug #382503)
+
 2007-01-31  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-settings-keyboard-xkb.c:
diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
index 843074efc..95a30e9b6 100644
--- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
@@ -658,6 +658,11 @@ acme_filter_events (GdkXEvent *xevent, GdkEvent *event, gpointer data)
 	guint keycode, state;
 	int i;
 
+	/* verify we have a key event */
+	if (xev->xany.type != KeyPress &&
+			xev->xany.type != KeyRelease)
+		return GDK_FILTER_CONTINUE;
+
 	keycode = xev->xkey.keycode;
 	state = xev->xkey.state;