diff --git a/sao/src/view/tree.js b/sao/src/view/tree.js
index 93ad0e41ae..7cb6c3ff07 100644
--- a/sao/src/view/tree.js
+++ b/sao/src/view/tree.js
@@ -2080,7 +2080,8 @@
 
             Sao.View.Tree.RowEditable._super.select_row.call(this, event_);
 
-            if (!event_.shiftKey && !(event_.ctrlKey || event_.metaKey)) {
+            if (!event_.shiftKey && !(event_.ctrlKey || event_.metaKey) &&
+                (this.record === current_record)) {
                 this.tree.edit_row(this);
             }
         },