diff --git a/sao/src/view/tree.js b/sao/src/view/tree.js
index e6bb8302b5..a4a83c08bf 100644
--- a/sao/src/view/tree.js
+++ b/sao/src/view/tree.js
@@ -1361,7 +1361,7 @@
                         if (this.editable && new_) {
                             td.trigger('click');
                         }
-                        td.find(':input,[tabindex=0]').focus();
+                        Sao.common.find_focusable_child(td).focus();
                     }
                 }
             };