diff --git a/src/public/javascripts/services/note_type.js b/src/public/javascripts/services/note_type.js
index 83c5dfe92..34922c2c9 100644
--- a/src/public/javascripts/services/note_type.js
+++ b/src/public/javascripts/services/note_type.js
@@ -1,5 +1,5 @@
 import treeService from './tree.js';
-import noteDetail from './note_detail.js';
+import noteDetailService from './note_detail.js';
 import server from './server.js';
 import infoService from "./info.js";
 
@@ -84,13 +84,13 @@ function NoteTypeModel() {
     };
 
     async function save() {
-        const note = noteDetail.getCurrentNote();
+        const note = noteDetailService.getCurrentNote();
 
         await server.put('notes/' + note.noteId
             + '/type/' + encodeURIComponent(self.type())
             + '/mime/' + encodeURIComponent(self.mime()));
 
-        await noteDetail.reload();
+        await noteDetailService.reload();
 
         // for the note icon to be updated in the tree
         await treeService.reload();
diff --git a/src/public/javascripts/services/protected_session.js b/src/public/javascripts/services/protected_session.js
index b911f6138..399742250 100644
--- a/src/public/javascripts/services/protected_session.js
+++ b/src/public/javascripts/services/protected_session.js
@@ -1,5 +1,5 @@
 import treeService from './tree.js';
-import noteDetail from './note_detail.js';
+import noteDetailService from './note_detail.js';
 import utils from './utils.js';
 import server from './server.js';
 import protectedSessionHolder from './protected_session_holder.js';
@@ -57,7 +57,7 @@ async function setupProtectedSession() {
 
     $dialog.dialog("close");
 
-    noteDetail.reload();
+    noteDetailService.reload();
     treeService.reload();
 
     if (protectedSessionDeferred !== null) {
@@ -90,27 +90,27 @@ async function enterProtectedSession(password) {
 async function protectNoteAndSendToServer() {
     await ensureProtectedSession(true, true);
 
-    const note = noteDetail.getCurrentNote();
+    const note = noteDetailService.getCurrentNote();
     note.isProtected = true;
 
-    await noteDetail.saveNote(note);
+    await noteDetailService.saveNote(note);
 
     treeService.setProtected(note.noteId, note.isProtected);
 
-    noteDetail.setNoteBackgroundIfProtected(note);
+    noteDetailService.setNoteBackgroundIfProtected(note);
 }
 
 async function unprotectNoteAndSendToServer() {
     await ensureProtectedSession(true, true);
 
-    const note = noteDetail.getCurrentNote();
+    const note = noteDetailService.getCurrentNote();
     note.isProtected = false;
 
-    await noteDetail.saveNote(note);
+    await noteDetailService.saveNote(note);
 
     treeService.setProtected(note.noteId, note.isProtected);
 
-    noteDetail.setNoteBackgroundIfProtected(note);
+    noteDetailService.setNoteBackgroundIfProtected(note);
 }
 
 async function protectBranch(noteId, protect) {
@@ -121,7 +121,7 @@ async function protectBranch(noteId, protect) {
     infoService.showMessage("Request to un/protect sub tree has finished successfully");
 
     treeService.reload();
-    noteDetail.reload();
+    noteDetailService.reload();
 }
 
 $passwordForm.submit(() => {
diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js
index 751a8d3fb..9a47262ee 100644
--- a/src/public/javascripts/services/tree.js
+++ b/src/public/javascripts/services/tree.js
@@ -293,7 +293,7 @@ function initFancyTree(branch) {
         keyboard: false, // we takover keyboard handling in the hotkeys plugin
         extensions: ["hotkeys", "filter", "dnd", "clones"],
         source: branch,
-        scrollParent: $("#tree"),
+        scrollParent: $tree,
         click: (event, data) => {
             const targetType = data.targetType;
             const node = data.node;