diff --git a/ChangeLog b/ChangeLog
index 1b455df84e..1bf2033c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+        * gtk/gtkiconview.c (gtk_icon_view_get_item_at_coords): Fix
+        row_spacing/column_spacing confusion.  (#330732, Donald Straney)
+
 2006-02-11  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Corrections
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1b455df84e..1bf2033c3f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+        * gtk/gtkiconview.c (gtk_icon_view_get_item_at_coords): Fix
+        row_spacing/column_spacing confusion.  (#330732, Donald Straney)
+
 2006-02-11  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Corrections
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index c3f13ecb45..b62012fabb 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3103,8 +3103,8 @@ gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
     {
       GtkIconViewItem *item = items->data;
 
-      if (x >= item->x - icon_view->priv->row_spacing/2 && x <= item->x + item->width + icon_view->priv->row_spacing/2 &&
-	  y >= item->y - icon_view->priv->column_spacing/2 && y <= item->y + item->height + icon_view->priv->column_spacing/2)
+      if (x >= item->x - icon_view->priv->column_spacing/2 && x <= item->x + item->width + icon_view->priv->column_spacing/2 &&
+	  y >= item->y - icon_view->priv->row_spacing/2 && y <= item->y + item->height + icon_view->priv->row_spacing/2)
 	{
 	  if (only_in_cell || cell_at_pos)
 	    {