diff --git a/src/public/javascripts/protected_session.js b/src/public/javascripts/protected_session.js
index 77269388a..6eb1cf511 100644
--- a/src/public/javascripts/protected_session.js
+++ b/src/public/javascripts/protected_session.js
@@ -25,7 +25,9 @@ const protected_session = (function() {
         if (requireProtectedSession && !isProtectedSessionAvailable()) {
             protectedSessionDeferred = dfd;
 
-            $noteDetailWrapper.hide();
+            if (noteTree.getCurrentNode().data.isProtected) {
+                $noteDetailWrapper.hide();
+            }
 
             $dialog.dialog({
                 modal: modal,
diff --git a/src/public/libraries/codemirror/addon/lint/eslint.js b/src/public/libraries/codemirror/addon/lint/eslint.js
index a1520134b..dce86d9fb 100644
--- a/src/public/libraries/codemirror/addon/lint/eslint.js
+++ b/src/public/libraries/codemirror/addon/lint/eslint.js
@@ -11,9 +11,15 @@
 })(function(CodeMirror) {
   "use strict";
 
-  async function validator(text, options) {console.log("Validating...");
+  async function validator(text, options) {
     await requireLibrary(ESLINT);
 
+    if (text.length > 20000) {
+        console.log("Skipping linting because of large size: ", text.length);
+
+        return [];
+    }
+
     var errors = new eslint().verify(text, {
         root: true,
         parserOptions: {
@@ -29,7 +35,6 @@
             'import/no-extraneous-dependencies': 'off',
             'func-names': 'off',
             'no-multi-spaces': 'off',
-            'spaced-comment': ["error", "always", { "markers": ["/"] }],
             'comma-dangle': ['error'],
             'padded-blocks': 'off',
             'linebreak-style': 'off',