diff --git a/src/view/tree.js b/src/view/tree.js
index a517a9146d..6357a011d5 100644
--- a/src/view/tree.js
+++ b/src/view/tree.js
@@ -2167,9 +2167,13 @@
                                             }.bind(this));
                                     }
                                 } else {
-                                    this._get_column_td(next_column, next_row)
-                                        .trigger('click')
-                                        .find(':input,[tabindex=0]').focus();
+                                    prm.then(function() {
+                                        this._get_column_td(
+                                            next_column, next_row)
+                                            .trigger('click')
+                                            .find(':input,[tabindex=0]')
+                                            .focus();
+                                    }.bind(this));
                                 }
                             }
                         }.bind(this));