diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
index 915ba50e..ceb8f30a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -294,7 +294,7 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun displayRenameDialog() {
-        RenameNoteDialog(this, mCurrentNote) {
+        RenameNoteDialog(this, mCurrentNote, getCurrentNoteText()) {
             mCurrentNote = it
             initViewPager(mCurrentNote.id)
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
index 4654a7b2..654f906e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
@@ -5,13 +5,14 @@ import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.activities.SimpleActivity
+import com.simplemobiletools.notes.pro.extensions.config
 import com.simplemobiletools.notes.pro.extensions.notesDB
 import com.simplemobiletools.notes.pro.helpers.NotesHelper
 import com.simplemobiletools.notes.pro.models.Note
 import kotlinx.android.synthetic.main.dialog_new_note.view.*
 import java.io.File
 
-class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val callback: (note: Note) -> Unit) {
+class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val currentNoteText: String?, val callback: (note: Note) -> Unit) {
 
     init {
         val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null)
@@ -39,6 +40,10 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
             activity.notesDB.getNoteIdWithTitle(title) != null -> activity.toast(R.string.title_taken)
             else -> {
                 note.title = title
+                if (activity.config.autosaveNotes && currentNoteText != null) {
+                    note.value = currentNoteText
+                }
+
                 val path = note.path
                 if (path.isEmpty()) {
                     activity.notesDB.insertOrUpdate(note)