From 4a5941c24b56defca19a64964583bc0049410ce8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 10 Dec 2017 19:37:34 +0100
Subject: [PATCH] Fix get_next() for case when the node is last in the tree
 branch

---
 program/js/treelist.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/program/js/treelist.js b/program/js/treelist.js
index 0326e41ab..d84cfaae8 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -940,9 +940,16 @@ function rcube_treelist_widget(node, p)
         return dom2id(child);
       }
 
-      node = node.next();
-      if (node.length) {
-        return dom2id(node);
+      child = node.next();
+      if (child.length) {
+        return dom2id(child);
+      }
+
+      while ((node = node.parent('ul').parent('li')) && node.length) {
+        child = node.next();
+        if (child.length) {
+          return dom2id(child);
+        }
       }
     }
   }