diff --git a/command/next.go b/command/next.go
index bc2fe6d..5a30e5f 100644
--- a/command/next.go
+++ b/command/next.go
@@ -35,7 +35,11 @@ func nextTodoFromTodos(todos []todo.Todo) (todo.Todo, bool) {
 		}
 
 		if len(todo.Todos) > 0 {
-			return nextTodoFromTodos(todo.Todos)
+			subtodo, found := nextTodoFromTodos(todo.Todos)
+			if found {
+				return subtodo, true
+			}
+			return todo, true
 		}
 
 		return todo, true