From dc6a530d8c8794b668ca57b08817346efab2cc2f Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Wed, 21 Apr 2021 20:38:07 +0200
Subject: [PATCH 1/2] clear note selection anytime a new note is activated

---
 .idea/vcs.xml                       | 1 -
 src/public/app/widgets/note_tree.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8fe5bdbdc..35eb1ddfb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index e2cee7c4f..4bff5f701 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -382,8 +382,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
                     }
                     else {
                         node.setActive();
-
-                        this.clearSelectedNodes();
                     }
 
                     return false;
@@ -393,6 +391,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
                 // click event won't propagate so let's close context menu manually
                 contextMenu.hide();
 
+                this.clearSelectedNodes();
+
                 const notePath = treeService.getNotePath(data.node);
 
                 const activeTabContext = appContext.tabManager.getActiveTabContext();

From 1d99c4e80b36feda4b2150276889e02f5b3ef5c1 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Wed, 21 Apr 2021 22:03:41 +0200
Subject: [PATCH 2/2] fix moving notes with keyboard on Firefox, closes #1865

---
 src/public/app/widgets/note_tree.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 4bff5f701..baf16e31f 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -1144,11 +1144,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
             }
 
             if (node) {
-                node.setActive(true, {noEvents: true, noFocus: !activeNodeFocused});
-
                 if (activeNodeFocused) {
-                    node.setFocus(true);
+                    // needed by Firefox: https://github.com/zadam/trilium/issues/1865
+                    this.tree.$container.focus();
                 }
+
+                await node.setActive(true, {noEvents: true, noFocus: !activeNodeFocused});
             }
             else {
                 // this is used when original note has been deleted and we want to move the focus to the note above/below