diff --git a/renderer/views/create-torrent-page.js b/renderer/views/create-torrent-page.js
index ca9ac94e..d1213d38 100644
--- a/renderer/views/create-torrent-page.js
+++ b/renderer/views/create-torrent-page.js
@@ -47,8 +47,8 @@ function CreateTorrentPage (state) {
     basePath = pathPrefix
   } else {
     // Multi file torrent: /a/b/{foo, bar}.jpg -> torrent name "b", path "/a"
-    defaultName = files[0].name
-    basePath = path.basename(pathPrefix)
+    defaultName = path.basename(pathPrefix)
+    basePath = path.dirname(pathPrefix)
   }
   var maxFileElems = 100
   var fileElems = files.slice(0, maxFileElems).map(function (file) {