diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 2f4ddd0..edb0196 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -283,11 +283,10 @@ check_table (GtkIMContextSimple    *context_simple,
 
 #ifdef GDK_WINDOWING_WIN32
 
-/* On Windows, user expectation is that typing a dead accent followed
- * by space will input the corresponding spacing character. The X
- * compose tables are different for dead acute and diaeresis, which
- * when followed by space produce a plain ASCII apostrophe and double
- * quote respectively. So special-case those.
+/* On Windows, user expectation is that typing a dead acute or
+ * a dead diaeresis will emit an apostrophe or a double quote
+ * respectively. The default X behavior is to double the dead
+ * character, so we need a special case.
  */
 
 static gboolean
@@ -302,9 +301,9 @@ check_win32_special_cases (GtkIMContextSimple    *context_simple,
       switch (context_simple->compose_buffer[0])
 	{
 	case GDK_dead_acute:
-	  value = 0x00B4; break;
+	  value = 0x0027; break;
 	case GDK_dead_diaeresis:
-	  value = 0x00A8; break;
+	  value = 0x0022; break;
 	}
       if (value > 0)
 	{
