diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 6680d8ef9..37b2dfd73 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -991,9 +991,10 @@ void FileCatalog::renameRequested  (std::vector<FileBrowserEntry*> tbe) {
 				}
 				else {
 					success = true;
-            if (!safe_g_rename (ofname, nfname)) {
-						cacheMgr->renameEntry (ofname, tbe[i]->thumbnail->getMD5(), nfname);
-						reparseDirectory ();
+					if (!safe_g_rename (ofname, nfname)) {
+						cacheMgr->renameEntry (ofname, tbe[i]->thumbnail->getMD5(), nfname);
+						safe_g_remove(ofname + paramFileExtension);
+						reparseDirectory ();
 					}
 				}
 			}