diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts
index 8d8f21324..6d118ff53 100644
--- a/app/assets/javascripts/views/editor/editor_view.ts
+++ b/app/assets/javascripts/views/editor/editor_view.ts
@@ -191,6 +191,12 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
         this.editorValues.text = note.text;
         this.reloadTagsString();
       }
+      if (!this.editorValues.title) {
+        this.editorValues.title = note.title;
+      }
+      if (!this.editorValues.text) {
+        this.editorValues.text = note.text;
+      }
       if (note.lastSyncBegan && note.lastSyncEnd) {
         if (note.lastSyncBegan!.getTime() > note.lastSyncEnd!.getTime()) {
           this.showSavingStatus()