diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index c3a1b14..64f9635 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -1278,7 +1278,7 @@ _ephoto_single_populate_end(void *data, int type EINA_UNUSED,
 {
    Ephoto_Single_Browser *sb = data;
 
-   if (!sb->entry)
+   if (!sb->entry && sb->ephoto->state == EPHOTO_STATE_SINGLE)
      ephoto_single_browser_entry_set(sb->main,
                  eina_list_nth(sb->ephoto->entries, 0));
 
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 787e796..d641edb 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -1373,14 +1373,17 @@ _ephoto_thumb_populate_end(void *data, int type EINA_UNUSED,
      }
    else if (tb->ephoto->state == EPHOTO_STATE_SINGLE)
      {
-        ephoto_single_browser_entry_set(tb->ephoto->single_browser, NULL);
         if (tb->ephoto->entries)
           {
+             ephoto_single_browser_entry_set(tb->ephoto->single_browser, NULL);
              ephoto_single_browser_entries_set(tb->ephoto->single_browser,
                  tb->ephoto->entries);
           }
         else
-          ephoto_title_set(tb->ephoto, tb->ephoto->config->directory);
+          {
+             ephoto_single_browser_entry_set(tb->ephoto->single_browser, NULL);
+             ephoto_title_set(tb->ephoto, tb->ephoto->config->directory);
+          }
      }
    tb->entries = tb->ephoto->entries;
    if (eina_list_count(tb->entries) < 1)