diff --git a/src/flextype/core/Entries/Entries.php b/src/flextype/core/Entries/Entries.php
index 27bd331d..1067ed0a 100755
--- a/src/flextype/core/Entries/Entries.php
+++ b/src/flextype/core/Entries/Entries.php
@@ -513,7 +513,11 @@ class Entries
      */
     public function rename(string $id, string $new_id) : bool
     {
-        return rename($this->getDirLocation($id), $this->getDirLocation($new_id));
+        if (!Filesystem::has($this->getFileLocation($new_id))) {
+            return rename($this->getFileLocation($id), $this->getFileLocation($new_id));
+        } else {
+            return false;
+        }
     }
 
     /**