diff --git a/sao/src/view/tree.js b/sao/src/view/tree.js
index bd8caa4bb3..2a019ee712 100644
--- a/sao/src/view/tree.js
+++ b/sao/src/view/tree.js
@@ -1349,6 +1349,11 @@
                 this.expander.children().html(' ');
                 this.expander.on('click keypress',
                         Sao.common.click_press(this.toggle_row.bind(this)));
+                this.expander.dblclick(function (evt) {
+                    // prevent calling switch_row on td
+                    evt.preventDefault();
+                    evt.stopImmediatePropagation();
+                });
             }
 
             for (var i = 0; i < this.tree.columns.length; i++) {