diff --git a/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFile.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFile.java
index e87828db5..22fa0145d 100644
--- a/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFile.java
+++ b/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFile.java
@@ -46,4 +46,15 @@ class ShorteningFile extends DelegatingFile<ShorteningFolder> {
 		return super.openWritable();
 	}
 
+	@Override
+	public void moveTo(File destination) {
+		super.moveTo(destination);
+		if (destination instanceof ShorteningFile) {
+			ShorteningFile dest = (ShorteningFile) destination;
+			if (shortener.isShortened(dest.shortenedName())) {
+				shortener.saveMapping(dest.name(), dest.shortenedName());
+			}
+		}
+	}
+
 }