diff --git a/bin/package.js b/bin/package.js
index d8f875b8..ff9469a2 100755
--- a/bin/package.js
+++ b/bin/package.js
@@ -154,14 +154,23 @@ function postDarwinism () {
   ])
   var infoPlist = plist.parse(fs.readFileSync(infoPlistPath).toString())
 
-  infoPlist['CFBundleDocumentTypes'] = [{
-    CFBundleTypeExtensions: [ 'torrent' ],
-    CFBundleTypeIconFile: 'WebTorrentFile.icns',
-    CFBundleTypeName: 'BitTorrent Document',
-    CFBundleTypeRole: 'Editor',
-    LSHandlerRank: 'Owner',
-    LSItemContentTypes: [ 'org.bittorrent.torrent' ]
-  }]
+  infoPlist.CFBundleDocumentTypes = [
+    {
+      CFBundleTypeExtensions: [ 'torrent' ],
+      CFBundleTypeIconFile: 'WebTorrentFile.icns',
+      CFBundleTypeName: 'BitTorrent Document',
+      CFBundleTypeRole: 'Editor',
+      LSHandlerRank: 'Owner',
+      LSItemContentTypes: [ 'org.bittorrent.torrent' ]
+    },
+    {
+      CFBundleTypeName: 'Any',
+      CFBundleTypeOSTypes: [ '****' ],
+      CFBundleTypeRole: 'Editor',
+      LSTypeIsPackage: false,
+      LSHandlerRank: 'Owner'
+    }
+  ]
 
   fs.writeFileSync(infoPlistPath, plist.build(infoPlist))
   cp.execSync(`cp ${webTorrentFileIconPath} ${resourcesPath}`)
diff --git a/main/index.js b/main/index.js
index bcfdb8fe..dd3211f9 100644
--- a/main/index.js
+++ b/main/index.js
@@ -42,5 +42,5 @@ ipc.init()
 
 function onOpen (e, torrentId) {
   e.preventDefault()
-  windows.main.send('dispatch', 'addTorrent', torrentId)
+  windows.main.send('dispatch', 'openFiles', torrentId)
 }
diff --git a/renderer/index.js b/renderer/index.js
index 1c633a06..29db7ff1 100644
--- a/renderer/index.js
+++ b/renderer/index.js
@@ -89,7 +89,7 @@ function init () {
   detectDevices()
 
   // ...drag and drop a torrent or video file to play or seed
-  dragDrop('body', onFiles)
+  dragDrop('body', (files) => dispatch('openFiles', files))
 
   // ...same thing if you paste a torrent
   document.addEventListener('paste', onPaste)
@@ -159,6 +159,9 @@ function dispatch (action, ...args) {
   if (['videoMouseMoved', 'playbackJump'].indexOf(action) < 0) {
     console.log('dispatch: %s %o', action, args) /* log user interactions, but don't spam */
   }
+  if (action === 'openFiles') {
+    openFiles(args[0] /* files */)
+  }
   if (action === 'addTorrent') {
     addTorrent(args[0] /* torrent */)
   }
@@ -319,14 +322,16 @@ function updateClientProgress () {
   state.dock.progress = progress
 }
 
-function onFiles (files) {
+function openFiles (files) {
+  if (!Array.isArray(files)) files = [ files ]
+
   // .torrent file = start downloading the torrent
   files.filter(isTorrentFile).forEach(function (torrentFile) {
-    dispatch('addTorrent', torrentFile)
+    addTorrent(torrentFile)
   })
 
   // everything else = seed these files
-  dispatch('seed', files.filter(isNotTorrentFile))
+  seed(files.filter(isNotTorrentFile))
 }
 
 function onPaste (e) {
@@ -341,7 +346,8 @@ function onPaste (e) {
 }
 
 function isTorrentFile (file) {
-  var extname = path.extname(file.name).toLowerCase()
+  var name = typeof file === 'string' ? file : file.name
+  var extname = path.extname(name).toLowerCase()
   return extname === '.torrent'
 }