diff --git a/src/repository/backup_file.rs b/src/repository/backup_file.rs
index e12c4bd..a280a37 100644
--- a/src/repository/backup_file.rs
+++ b/src/repository/backup_file.rs
@@ -168,7 +168,10 @@ impl Backup {
                     paths.push(path);
                 } else {
                     let relpath = path.strip_prefix(&base_path).unwrap();
-                    let name = relpath.to_string_lossy().to_string();
+                    if relpath.extension() != Some(".backup".as_ref()) {
+                        continue
+                    }
+                    let name = relpath.file_stem().unwrap().to_string_lossy().to_string();
                     if let Ok(backup) = Backup::read_from(crypto, &path) {
                         backups.insert(name, backup);
                     } else {
diff --git a/src/repository/layout.rs b/src/repository/layout.rs
index 5c6d7f1..0d3f421 100644
--- a/src/repository/layout.rs
+++ b/src/repository/layout.rs
@@ -52,7 +52,7 @@ impl RepositoryLayout {
 
     #[inline]
     pub fn backup_path(&self, name: &str) -> PathBuf {
-        self.backups_path().join(name)
+        self.backups_path().join(format!("{}.backup", name))
     }
 
     #[inline]