diff --git a/sao/src/view/tree.js b/sao/src/view/tree.js
index dbd3819f14..6900029199 100644
--- a/sao/src/view/tree.js
+++ b/sao/src/view/tree.js
@@ -1342,7 +1342,10 @@
                         if (this.editable && new_) {
                             td.trigger('click');
                         }
-                        Sao.common.find_focusable_child(td).focus();
+                        var child = Sao.common.find_focusable_child(td);
+                        if (child) {
+                            child.focus();
+                        }
                     }
                 }
             };