diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 749951ef7..416bf3460 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -65,7 +65,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
                     true
                 }
                 R.id.cab_rename -> {
-                    editDir()
+                    renameDir()
                     true
                 }
                 R.id.cab_pin -> {
@@ -109,8 +109,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
 
         override fun onPrepareActionMode(actionMode: ActionMode?, menu: Menu): Boolean {
             val positions = multiSelector.selectedPositions
-            val menuItem = menu.findItem(R.id.cab_rename)
-            menuItem.isVisible = positions.size <= 1
+            menu.findItem(R.id.cab_rename).isVisible = positions.size <= 1
 
             checkHideBtnVisibility(menu, positions)
             checkPinBtnVisibility(menu, positions)
@@ -165,7 +164,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
         }
     }
 
-    private fun editDir() {
+    private fun renameDir() {
         val path = dirs[multiSelector.selectedPositions[0]].path
         val dir = File(path)
         if (activity.isAStorageRootFolder(dir.absolutePath)) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index 0ed8131cf..3cdcbd353 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -18,6 +18,7 @@ import com.simplemobiletools.fileproperties.dialogs.PropertiesDialog
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.SimpleActivity
 import com.simplemobiletools.gallery.dialogs.CopyDialog
+import com.simplemobiletools.gallery.dialogs.RenameFileDialog
 import com.simplemobiletools.gallery.extensions.beVisibleIf
 import com.simplemobiletools.gallery.extensions.shareMedia
 import com.simplemobiletools.gallery.extensions.shareMedium
@@ -62,6 +63,10 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
                     showProperties()
                     true
                 }
+                R.id.cab_rename -> {
+                    renameFile()
+                    true
+                }
                 R.id.cab_share -> {
                     shareMedia()
                     return true
@@ -85,7 +90,11 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
             return true
         }
 
-        override fun onPrepareActionMode(actionMode: ActionMode?, menu: Menu) = true
+        override fun onPrepareActionMode(actionMode: ActionMode?, menu: Menu): Boolean {
+            menu.findItem(R.id.cab_rename).isVisible = multiSelector.selectedPositions.size <= 1
+
+            return true
+        }
 
         override fun onDestroyActionMode(actionMode: ActionMode?) {
             super.onDestroyActionMode(actionMode)
@@ -105,6 +114,15 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
         }
     }
 
+    private fun renameFile() {
+        RenameFileDialog(activity, File(media[multiSelector.selectedPositions[0]].path)) {
+            listener?.refreshItems()
+            activity.runOnUiThread {
+                actMode?.finish()
+            }
+        }
+    }
+
     private fun shareMedia() {
         val selections = multiSelector.selectedPositions
         if (selections.size <= 1) {
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index fe37abbb3..8d51dbad8 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -16,6 +16,11 @@
         android:icon="@mipmap/copy"
         android:title="@string/copy_move"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/cab_rename"
+        android:icon="@mipmap/rename"
+        android:title="@string/rename"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
         android:icon="@mipmap/delete"