diff --git a/src/bin/main.c b/src/bin/main.c
index 55ab5538..e4b68af3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -436,7 +436,7 @@ _term_next_get(Term *termin)
    sp = _split_find(termin->wn->win, termin->term);
    l = eina_list_data_find_list(sp->terms, termin);
    if ((l) && (l->next)) return l->next->data;
-   if (!sp->parent) return NULL;
+   if (!sp->parent) return sp->terms->data;
    flat = _split_flatten(termin->wn->split);
    if (!flat) return NULL;
    l = eina_list_data_find_list(flat, sp);
@@ -467,7 +467,7 @@ _term_prev_get(Term *termin)
    sp = _split_find(termin->wn->win, termin->term);
    l = eina_list_data_find_list(sp->terms, termin);
    if ((l) && (l->prev)) return l->prev->data;
-   if (!sp->parent) return NULL;
+   if (!sp->parent) return eina_list_data_get(eina_list_last(sp->terms));
    flat = _split_flatten(termin->wn->split);
    if (!flat) return NULL;
    l = eina_list_data_find_list(flat, sp);