diff --git a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
index 4b7dff6e..8da5a182 100644
--- a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
+++ b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
@@ -200,6 +200,10 @@ public class FileSystemHelper {
         var sourceFile = source.getPath();
         var targetFile = FileNames.join(target.getPath(), FileNames.getFileName(sourceFile));
 
+        if (sourceFile.equals(targetFile)) {
+            return;
+        }
+
         if (source.getKind() == FileKind.DIRECTORY && target.getFileSystem().directoryExists(targetFile)) {
             throw ErrorEvent.unreportable(new IllegalArgumentException("Target directory " + targetFile + " does already exist"));
         }
diff --git a/dist/changelogs/1.7.13.md b/dist/changelogs/1.7.13.md
index da2db439..3b12a68a 100644
--- a/dist/changelogs/1.7.13.md
+++ b/dist/changelogs/1.7.13.md
@@ -19,5 +19,6 @@
 
 - Fix some shells not properly setting up the PATH
 - Fix git vault repository throwing initialization errors when shared with multiple Windows user permissions
+- Fix copying and pasting a file into the same directory returning an error
 - Fix connections being accidentally listed under scripts category
   if they were added while scripts category was selected