diff --git a/src/entities/note_revision.js b/src/entities/note_revision.js
index 32bf3c613..5b1798f56 100644
--- a/src/entities/note_revision.js
+++ b/src/entities/note_revision.js
@@ -33,6 +33,7 @@ class NoteRevision extends Entity {
     constructor(row) {
         super(row);
 
+        this.isErased = !!this.isErased;
         this.isProtected = !!this.isProtected;
 
         if (this.isProtected) {
diff --git a/src/routes/api/note_revisions.js b/src/routes/api/note_revisions.js
index cdbf36d70..c016768c7 100644
--- a/src/routes/api/note_revisions.js
+++ b/src/routes/api/note_revisions.js
@@ -86,8 +86,9 @@ function downloadNoteRevision(req, res) {
 function eraseOneNoteRevision(noteRevision) {
     noteRevision.isErased = true;
     noteRevision.title = null;
-    noteRevision.setContent(null);
     noteRevision.save();
+
+    noteRevision.setContent(null);
 }
 
 function eraseAllNoteRevisions(req) {
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index 82c9104e1..e6e225bd5 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -364,7 +364,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
     },
     {
         actionName: "findInText",
-        defaultShortcuts: ["CommandOrControl+F"],
+        defaultShortcuts: isElectron ? ["CommandOrControl+F"] : [],
         scope: "window"
     },
     {