diff --git a/src/bin/channel.c b/src/bin/channel.c
index af58d6e..c3cd335 100644
--- a/src/bin/channel.c
+++ b/src/bin/channel.c
@@ -667,13 +667,12 @@ _cb_treeview_selected(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
    if ((pchl = _window_channel_active_get()))
      {
         if (pchl != chl)
-          _window_channel_unswallow(pchl);
+          {
+             _window_channel_unswallow(pchl);
+             _window_channel_activate(chl);
+             _window_channel_swallow(chl);
+          }
      }
-
-   _window_channel_activate(chl);
-   _window_channel_swallow(chl);
-
-   /* elm_genlist_item_selected_set(item, EINA_TRUE); */
 }
 
 static void 
@@ -1469,6 +1468,7 @@ _channel_treeview_group_item_add(Channel *pchl, Channel *chl, Elm_Object_Item *g
      elm_genlist_item_append(pchl->treeview.o_list, pchl->treeview.itc,
                              chl, group, ELM_GENLIST_ITEM_NONE,
                              _cb_treeview_selected, NULL);
+   elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
    if (chl->active)
      elm_genlist_item_selected_set(it, EINA_TRUE);
@@ -1483,6 +1483,7 @@ _channel_treeview_item_add(Channel *pchl, Channel *chl)
      elm_genlist_item_append(pchl->treeview.o_list, pchl->treeview.itc,
                              chl, NULL, ELM_GENLIST_ITEM_NONE,
                              _cb_treeview_selected, NULL);
+   elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
    if (chl->active)
      elm_genlist_item_selected_set(it, EINA_TRUE);