diff --git a/src/bin/ephoto_flow_browser.c b/src/bin/ephoto_flow_browser.c
index 4374170..5e358ae 100644
--- a/src/bin/ephoto_flow_browser.c
+++ b/src/bin/ephoto_flow_browser.c
@@ -415,6 +415,7 @@ _ephoto_flow_browser_recalc(Ephoto_Flow_Browser *fb)
         fb->viewer = _viewer_add(fb->orient_layout, fb->path);
         elm_layout_content_set
           (fb->orient_layout, "elm.swallow.content", fb->viewer);
+        evas_object_show(fb->viewer);
         evas_object_event_callback_add
           (fb->viewer, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel, fb);
         edje_object_part_text_set(fb->edje, "elm.text.title", bname);
@@ -699,7 +700,6 @@ ephoto_flow_browser_add(Ephoto *ephoto, Evas_Object *parent)
    evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _layout_del, fb);
    evas_object_event_callback_add
      (layout, EVAS_CALLBACK_KEY_DOWN, _key_down, fb);
-   elm_object_focus_allow_set(layout, EINA_TRUE);
    evas_object_data_set(layout, "flow_browser", fb);
 
    edje_object_signal_callback_add(fb->edje, "elm,action,back", "", _back, fb);
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index d73fc87..c4a2a41 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -21,8 +21,8 @@ _ephoto_thumb_browser_show(Ephoto *ephoto, Ephoto_Entry *entry)
 
    ephoto_flow_browser_path_set(ephoto->flow_browser, NULL);
    ephoto_slideshow_entry_set(ephoto->slideshow, NULL);
-   elm_object_focus(ephoto->thumb_browser);
    elm_pager_content_promote(ephoto->pager, ephoto->thumb_browser);
+   elm_object_focus(ephoto->thumb_browser);
    _ephoto_state_set(ephoto, EPHOTO_STATE_THUMB);
 
    if ((entry) && (entry->item)) elm_gengrid_item_bring_in(entry->item);
@@ -33,8 +33,8 @@ _ephoto_flow_browser_show(Ephoto *ephoto, Ephoto_Entry *entry)
 {
    DBG("entry '%s'", entry->path);
    ephoto_flow_browser_entry_set(ephoto->flow_browser, entry);
-   elm_object_focus(ephoto->flow_browser);
    elm_pager_content_promote(ephoto->pager, ephoto->flow_browser);
+   elm_object_focus(ephoto->flow_browser);
    _ephoto_state_set(ephoto, EPHOTO_STATE_FLOW);
 }
 
@@ -43,8 +43,8 @@ _ephoto_slideshow_show(Ephoto *ephoto, Ephoto_Entry *entry)
 {
    DBG("entry '%s'", entry->path);
    ephoto_slideshow_entry_set(ephoto->slideshow, entry);
-   elm_object_focus(ephoto->slideshow);
    elm_pager_content_promote(ephoto->pager, ephoto->slideshow);
+   elm_object_focus(ephoto->slideshow);
    _ephoto_state_set(ephoto, EPHOTO_STATE_SLIDESHOW);
 }