diff --git a/applications/services/storage/storage.h b/applications/services/storage/storage.h
index a1267575f..dccf29592 100644
--- a/applications/services/storage/storage.h
+++ b/applications/services/storage/storage.h
@@ -226,7 +226,7 @@ FS_Error storage_common_stat(Storage* storage, const char* path, FileInfo* filei
  */
 FS_Error storage_common_remove(Storage* storage, const char* path);
 
-/** Renames file/directory, file/directory must not be open
+/** Renames file/directory, file/directory must not be open. Will overwrite existing file.
  * @param app pointer to the api
  * @param old_path old path
  * @param new_path new path
diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c
index bf474bc9d..549397c87 100644
--- a/applications/services/storage/storage_external_api.c
+++ b/applications/services/storage/storage_external_api.c
@@ -422,7 +422,16 @@ FS_Error storage_common_remove(Storage* storage, const char* path) {
 }
 
 FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path) {
-    FS_Error error = storage_common_copy(storage, old_path, new_path);
+    FS_Error error;
+
+    if(storage_file_exists(storage, new_path)) {
+        error = storage_common_remove(storage, new_path);
+        if(error != FSE_OK) {
+            return error;
+        }
+    }
+
+    error = storage_common_copy(storage, old_path, new_path);
     if(error == FSE_OK) {
         if(!storage_simply_remove_recursive(storage, old_path)) {
             error = FSE_INTERNAL;