diff --git a/src/public/javascripts/services/protected_session.js b/src/public/javascripts/services/protected_session.js
index 60407421a..40c421fbd 100644
--- a/src/public/javascripts/services/protected_session.js
+++ b/src/public/javascripts/services/protected_session.js
@@ -85,7 +85,7 @@ async function setupProtectedSession() {
 }
 
 function ensureDialogIsClosed() {
-    // this may fal if the dialog has not been previously opened
+    // this may fal if the dialog has not been previously opened (not sure if still true with Bootstrap modal)
     try {
         $dialog.modal('hide');
     }
@@ -175,6 +175,8 @@ $dialog.on("show.bs.modal", e => function() {
 $protectButton.click(protectNoteAndSendToServer);
 $unprotectButton.click(unprotectNoteAndSendToServer);
 
+$dialog.on("shown.bs.modal", e => $password.focus());
+
 export default {
     ensureProtectedSession,
     protectSubtree,
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index f105d14bb..94f18d369 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -110,7 +110,7 @@ ul.fancytree-container {
     outline: none !important;
 }
 
-span.fancytree-node.protected > span.fancytree-icon {
+span.fancytree-node.protected > span.fancytree-custom-icon {
     filter: drop-shadow(2px 2px 2px black);
 }