diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
index 8014d33cd0..19164e26e1 100644
--- a/gtk/gtkcomposetable.c
+++ b/gtk/gtkcomposetable.c
@@ -1605,6 +1605,7 @@ gtk_check_algorithmically (const guint *compose_buffer,
             CASE (U, 0x367);
             CASE (small_schwa, 0x1DEA);
             CASE (capital_schwa, 0x1DEA);
+            CASE (hamza, 0x654);
 #undef CASE
             default:
               g_string_append_unichar (input, gdk_keyval_to_unicode (compose_buffer[i]));
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 5e23bff4da..f86c71ef9c 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -532,7 +532,7 @@ beep_surface (GdkSurface *surface)
 static inline gboolean
 is_dead_key (guint keysym)
 {
-  return GDK_KEY_dead_grave <= keysym && keysym <= GDK_KEY_dead_greek;
+  return GDK_KEY_dead_grave <= keysym && keysym <= GDK_KEY_dead_hamza;
 }
 
 static void
@@ -599,6 +599,7 @@ append_dead_key (GString *string,
     CASE (U, 0x367, 1);
     CASE (small_schwa, 0x1dea, 1);
     CASE (capital_schwa, 0x1dea, 1);
+    CASE (hamza, 0x621, 0);
 #undef CASE
     default:
       g_string_append_unichar (string, gdk_keyval_to_unicode (keysym));