diff --git a/picard/file.py b/picard/file.py
index 964ec9e11..fb794fa8e 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -236,7 +236,7 @@ class File(LockableObject, Item):
                 new_filename = new_filename.replace('/.', '/_').replace('\\.', '\\_')
                 if new_filename[0] == '.':
                     new_filename = '_' + new_filename[1:]
-        return os.path.join(new_dirname, new_filename + ext.lower())
+        return os.path.realpath(os.path.join(new_dirname, new_filename + ext.lower()))
 
     def _rename(self, old_filename, metadata, settings):
         new_filename, ext = os.path.splitext(
diff --git a/picard/tagger.py b/picard/tagger.py
index c9c3e4e2c..005eaa501 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -305,7 +305,7 @@ class Tagger(QtGui.QApplication):
         self.log.debug("Adding files %r", filenames)
         new_files = []
         for filename in filenames:
-            filename = os.path.normpath(filename)
+            filename = os.path.normpath(os.path.realpath(filename))
             if filename not in self.files:
                 file = open_file(filename)
                 if file: