diff --git a/ChangeLog b/ChangeLog
index 0cd6180339..da357b2ece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-02  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	Bug 457086 - numpad does not work when the Thai-Lao input method is
+	used
+
+	* modules/input/gtkimcontextthai.c (is_context_lost_key): Do not count
+	character-generating keypads as context-lost keys. (patch recommitted
+	after approval)
+
 2009-03-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/gdkkeysyms.h: Fix the sorting of GDK_KP_Equal.
diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c
index 0b2d6b6b58..640c013c5f 100644
--- a/modules/input/gtkimcontextthai.c
+++ b/modules/input/gtkimcontextthai.c
@@ -122,7 +122,7 @@ is_context_lost_key(guint keyval)
           keyval == GDK_Escape ||
           keyval == GDK_Delete ||
           (GDK_Home <= keyval && keyval <= GDK_Begin) || /* IsCursorkey */
-          (GDK_KP_Space <= keyval && keyval <= GDK_KP_Equal) || /* IsKeypadKey */
+          (GDK_KP_Space <= keyval && keyval <= GDK_KP_Delete) || /* IsKeypadKey, non-chars only */
           (GDK_Select <= keyval && keyval <= GDK_Break) || /* IsMiscFunctionKey */
           (GDK_F1 <= keyval && keyval <= GDK_F35)); /* IsFunctionKey */
 }