diff --git a/ChangeLog b/ChangeLog
index 6234d67f3c..deccafd791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkeventbox.c (gtk_event_box_realize): Fix the offsets
+	of the input-only window if we also have a visible window. 
+	(#405089)
+
 2007-04-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist_internal):
diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index bac1605d2f..8854609760 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -369,7 +369,6 @@ gtk_event_box_set_above_child (GtkEventBox *event_box,
 }
 
 
-
 static void
 gtk_event_box_realize (GtkWidget *widget)
 {
@@ -420,7 +419,10 @@ gtk_event_box_realize (GtkWidget *widget)
   if (!visible_window || priv->above_child)
     {
       attributes.wclass = GDK_INPUT_ONLY;
-      attributes_mask = GDK_WA_X | GDK_WA_Y;
+      if (!visible_window)
+        attributes_mask = GDK_WA_X | GDK_WA_Y;
+      else
+        attributes_mask = 0;
 
       priv->event_window = gdk_window_new (widget->window,
 					   &attributes, attributes_mask);