diff --git a/ChangeLog b/ChangeLog
index d140e24bc44748235ef9e1ede570c981bbc70680..58af311c2ffea254208b62f6cf22250c77ab6423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-22  Christian Neumair  <cneumair@gnome.org>
+
+	* libnautilus-private/nautilus-file.c (nautilus_file_get_icon):
+	Fix frame size calculation.
+
 2008-05-22  Christian Neumair  <cneumair@gnome.org>
 
 	* src/nautilus-main.c (main):
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index a866b511832014a69da117b572c53f3e01a4f538..5cdc9561fafb303a2c715c337694ca4a8e1a11da 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -3392,14 +3392,14 @@ nautilus_file_get_icon (NautilusFile *file,
 				w = gdk_pixbuf_get_width (raw_pixbuf);
 				h = gdk_pixbuf_get_height (raw_pixbuf);
 				
-				/* These compensates for frame size which will be added on the raw image */
-				s = MAX (NAUTILUS_THUMBNAIL_FRAME_LEFT + w + NAUTILUS_THUMBNAIL_FRAME_RIGHT,
-					 NAUTILUS_THUMBNAIL_FRAME_TOP + h + NAUTILUS_THUMBNAIL_FRAME_BOTTOM);
+				s = MAX (w, h);
 				
 				scale = (double)modified_size / s;
 
+				/* These compensate for the size of the frame which will be added around the raw image */
 				scaled_pixbuf = gdk_pixbuf_scale_simple (raw_pixbuf,
-									 w * scale, h * scale,
+									 NAUTILUS_THUMBNAIL_FRAME_LEFT + w * scale + NAUTILUS_THUMBNAIL_FRAME_RIGHT,
+									 NAUTILUS_THUMBNAIL_FRAME_TOP + h * scale + NAUTILUS_THUMBNAIL_FRAME_BOTTOM,
 									 GDK_INTERP_BILINEAR);
 				nautilus_thumbnail_frame_image (&scaled_pixbuf);