diff --git a/src/bin/ephoto_albums.c b/src/bin/ephoto_albums.c
index 535f285..4556255 100755
--- a/src/bin/ephoto_albums.c
+++ b/src/bin/ephoto_albums.c
@@ -236,7 +236,7 @@ create_athumb()
 
                 if (imagef)
                 {
-                        thumb = add_image(em->fbox, imagef, 1,
+		        thumb = add_image(em->fbox, imagef, 1,
                                         thumb_clicked, NULL);
                         ewl_image_constrain_set(EWL_IMAGE(thumb),
                                         ewl_range_value_get(EWL_RANGE
diff --git a/src/bin/ephoto_single_view.c b/src/bin/ephoto_single_view.c
index aef9e82..52b11a1 100644
--- a/src/bin/ephoto_single_view.c
+++ b/src/bin/ephoto_single_view.c
@@ -17,6 +17,7 @@ static void image_sepia(Ewl_Widget *w, void *event, void *data);
 static void close_channel(Ewl_Widget *w, void *event, void *data);
 static void channel_mixer(Ewl_Widget *w, void *event, void *data);
 static void set_requested_image_file(Ewl_Widget *w, void *event, void *data);
+static void set_image_file(Ewl_Widget *w, void *event, void *data);
 
 static void 
 set_requested_image_file(Ewl_Widget *w, void *event, void *data)
@@ -24,6 +25,14 @@ set_requested_image_file(Ewl_Widget *w, void *event, void *data)
 	ewl_image_file_path_set(EWL_IMAGE(w), ec->requested_image);
 }
 
+static void
+set_image_file(Ewl_Widget *w, void *event, void *data)
+{
+	ewl_image_file_path_set(EWL_IMAGE(w), ecore_dlist_current(em->images));
+	ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
+	ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, set_image_file);	
+}
+
 Ewl_Widget *
 add_single_view(Ewl_Widget *c)
 {
@@ -106,8 +115,8 @@ show_single_view(Ewl_Widget *w, void *event, void *data)
 						em->single_vbox);
 	if (ecore_dlist_current(em->images))
 	{
-		ewl_image_file_path_set(EWL_IMAGE(em->simage), 
-					ecore_dlist_current(em->images));
+		ewl_callback_append(em->simage, EWL_CALLBACK_CONFIGURE,
+						set_image_file, NULL);
 	}
 	return;
 }