diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index d34ff9971..195440f53 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -56,9 +56,9 @@ PF_KEY_QUERIES = {
     'singleton': 'singleton:true',
 }
 DEFAULT_PATH_FORMATS = [
-    (library.PF_KEY_DEFAULT,      '$albumartist/$album/$track $title'),
-    (PF_KEY_QUERIES['singleton'], 'Non-Album/$artist/$title'),
-    (PF_KEY_QUERIES['comp'],      'Compilations/$album/$track $title'),
+  (library.PF_KEY_DEFAULT,      '$albumartist/$album%aunique{}/$track $title'),
+  (PF_KEY_QUERIES['singleton'], 'Non-Album/$artist/$title'),
+  (PF_KEY_QUERIES['comp'],      'Compilations/$album%aunique{}/$track $title'),
 ]
 DEFAULT_ART_FILENAME = 'cover'
 DEFAULT_TIMEOUT = 5.0