diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index 789f58a9c..9be86953d 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -352,6 +352,11 @@ angular.module('app.frontend')
 
     this.onNameBlur = function() {
       this.editingName = false;
+<<<<<<< HEAD
+=======
+      keyboardManager.unlockKeyboardContext();
+      this.updateTagsFromTagsString()
+>>>>>>> c73cc80... Sync manager filter then slice, fix editor tags on blur, fix deleting note with no title
     }
 
     this.toggleFullScreen = function() {
@@ -366,7 +371,12 @@ angular.module('app.frontend')
     }
 
     this.deleteNote = function() {
+<<<<<<< HEAD
       if(confirm("Are you sure you want to delete this note?")) {
+=======
+      let title = this.note.safeTitle().length ? `'${this.note.title}'` : "this note";
+      if(confirm(`Are you sure you want to delete ${title}?`)) {
+>>>>>>> c73cc80... Sync manager filter then slice, fix editor tags on blur, fix deleting note with no title
         this.remove()(this.note);
         this.showMenu = false;
       }
@@ -430,9 +440,7 @@ angular.module('app.frontend')
       this.loadTagsString();
     }
 
-    this.updateTagsFromTagsString = function($event) {
-      $event.target.blur();
-
+    this.updateTagsFromTagsString = function() {
       var tags = this.tagsString.split("#");
       tags = _.filter(tags, function(tag){
         return tag.length > 0;