diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 7e75aa5..56aa1f3 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -63,7 +63,8 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
 
    evas_object_del(popup);
    elm_object_focus_set(ephoto->pager, EINA_TRUE);
-   ephoto_thumb_browser_recalc(ephoto);
+   if (ephoto->state == EPHOTO_STATE_THUMB)
+     ephoto_thumb_browser_recalc(ephoto);
 }
 
 static void
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index ec7f911..79c7d14 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -382,6 +382,7 @@ _on_transition_end(void *data, Evas_Object *obj EINA_UNUSED,
    evas_object_show(ss->current_item);
    elm_layout_signal_emit(ss->slideshow, "ephoto,transition,done", "ephoto");
 
+   ss->timeout = ss->ephoto->config->slideshow_timeout;
    if (ss->timer)
      ecore_timer_del(ss->timer);
    ss->timer = NULL;