diff --git a/TODO b/TODO
index e3a12fd..33fadb4 100644
--- a/TODO
+++ b/TODO
@@ -6,8 +6,6 @@ Add more effects, filters as necessary
 Clean up Cropper
 -Thumb Browser:
 Add ability to view more info on image(Exif perhaps?)
--Slideshow:
-Possibly look at implementing moving slideshows.
 -Other Possibilities:
 Exporting to flickr, facebook, etc..
 Read straight from a camera
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 561b5bf..7cbacda 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -77,6 +77,7 @@ _ephoto_single_browser_show(Ephoto *ephoto, Ephoto_Entry *entry)
    ephoto->menu_blocking = EINA_FALSE;
    ephoto->hover_blocking = EINA_FALSE;
    ephoto->editor_blocking = EINA_FALSE;
+   ephoto->folders_toggle = EINA_TRUE;
    ephoto_show_folders(ephoto, EINA_TRUE);
    ephoto_single_browser_show_controls(ephoto);
    ephoto_single_browser_adjust_offsets(ephoto);
@@ -103,6 +104,7 @@ _ephoto_slideshow_show(Ephoto *ephoto, Ephoto_Entry *entry)
    ephoto->menu_blocking = EINA_FALSE;
    ephoto->hover_blocking = EINA_FALSE;
    ephoto->editor_blocking = EINA_FALSE;
+   ephoto->folders_toggle = EINA_TRUE;
    ephoto_show_folders(ephoto, EINA_TRUE);
    ephoto_slideshow_adjust_offsets(ephoto);
 }
@@ -115,6 +117,7 @@ _ephoto_single_browser_back(void *data, Evas_Object *obj EINA_UNUSED,
    Ephoto_Entry *entry = event_info;
 
    ephoto->selentries = NULL;
+   ephoto->folders_toggle = EINA_TRUE;
    ephoto_show_folders(ephoto, EINA_TRUE);
    _ephoto_thumb_browser_show(ephoto, entry);
 }
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index b58e0bf..2c38d79 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -348,7 +348,7 @@ _slideshow_item_get(Ephoto_Slideshow *ss, Ephoto_Entry *entry, Evas_Object *pare
    evas_object_data_set(layout, "entry", entry);
 
    image = elm_image_add(parent);
-   elm_image_preload_disabled_set(image, EINA_TRUE);
+   elm_image_preload_disabled_set(image, EINA_FALSE);
    elm_image_smooth_set(image, EINA_FALSE);
    elm_image_file_set(image, entry->path, group);
    elm_image_fill_outside_set(image, EINA_TRUE);