diff --git a/sao/src/view/tree.js b/sao/src/view/tree.js
index 9f3b6c851e..cf2af58b9a 100644
--- a/sao/src/view/tree.js
+++ b/sao/src/view/tree.js
@@ -1811,9 +1811,11 @@
                 return;
             }
 
-            body = listener = jQuery(document.body);
+            body = jQuery(document.body);
             if (body.hasClass('modal-open')) {
                 listener = this.tree.el.parents('.modal').last();
+            } else {
+                listener = this.tree.el.parents('.tab-pane').last();
             }
             var handler = function(event_) {
                 if ((event_.currentTarget == body[0]) &&
@@ -1826,7 +1828,7 @@
                     event_.stopPropagation();
                     return;
                 }
-                body.off('click.sao.editabletree');
+                listener.off('click.sao.editabletree');
                 this.tree.edit_row(null);
                 return true;
             }.bind(this);