diff --git a/src/xterm.c b/src/xterm.c
index 2a4ea883bc1..bf606b1aa42 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9964,6 +9964,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #ifdef HAVE_X_I18N
           if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea))
             xic_set_statusarea (f);
+
+	  if (f)
+	    {
+	      struct window *w = XWINDOW (f->selected_window);
+	      xic_set_preeditarea (w, w->cursor.x, w->cursor.y);
+	    }
 #endif
 
 	}