diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index 8ea85d53..58594fbd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -114,7 +114,9 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     }
 
     private fun displayRenameDialog() {
-        RenameItemDialog(activity, getSelectedMedia()[0].path) {
+        val oldPath = getSelectedMedia()[0].path
+        RenameItemDialog(activity, oldPath) {
+            activity.config.moveFavorite(oldPath, it)
             activity.runOnUiThread {
                 listener?.refreshItems()
                 finishActMode()
@@ -359,6 +361,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
                 val file = fileDirItems[it]
                 files.add(File(file.path))
                 removeFiles.add(file)
+                activity.config.removeFavorite(file.path)
             }
 
             fileDirItems.removeAll(removeFiles)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
index 2844f534..6b242e26 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
@@ -5,7 +5,6 @@ import com.simplemobiletools.commons.extensions.getInternalStoragePath
 import com.simplemobiletools.commons.helpers.BaseConfig
 import com.simplemobiletools.commons.helpers.SORT_BY_NAME
 import java.io.File
-import java.util.*
 
 class Config(context: Context) : BaseConfig(context) {
     companion object {
@@ -38,7 +37,22 @@ class Config(context: Context) : BaseConfig(context) {
         favorites = currFavorites
     }
 
+    fun moveFavorite(oldPath: String, newPath: String) {
+        if (!favorites.contains(oldPath)) {
+            return
+        }
+
+        val currFavorites = HashSet<String>(favorites)
+        currFavorites.remove(oldPath)
+        currFavorites.add(newPath)
+        favorites = currFavorites
+    }
+
     fun removeFavorite(path: String) {
+        if (!favorites.contains(path)) {
+            return
+        }
+
         val currFavorites = HashSet<String>(favorites)
         currFavorites.remove(path)
         favorites = currFavorites