diff --git a/src/imlib2.c b/src/imlib2.c
index c61248a5..000eca18 100644
--- a/src/imlib2.c
+++ b/src/imlib2.c
@@ -118,6 +118,10 @@ static void cimlib_draw_image(struct image_list_s *cur)
 		imlib_context_set_image(image);
 		w = imlib_image_get_width();
 		h = imlib_image_get_height();
+		if (!cur->wh_set) {
+			cur->w = w;
+			cur->h = h;
+		}
 		imlib_context_set_image(buffer);
 		imlib_blend_image_onto_image(image, 1, 0, 0, h, w,
 				cur->x, cur->y, cur->w, cur->h);