diff --git a/app/browser/webtorrent.js b/app/browser/webtorrent.js
index f5a44945c9d..7f08ba2e2be 100644
--- a/app/browser/webtorrent.js
+++ b/app/browser/webtorrent.js
@@ -1,11 +1,19 @@
 const electron = require('electron')
 const ipc = electron.ipcMain
+const appUrlUtil = require('../../js/lib/appUrlUtil')
 const messages = require('../../js/constants/messages')
+const Filtering = require('../filtering')
 
 // Set to see communication between WebTorrent and torrent viewer tabs
 const DEBUG_IPC = false
 if (DEBUG_IPC) console.log('WebTorrent IPC debugging enabled')
 
+var VIEWER_URL = appUrlUtil.getTorrentExtUrl('webtorrent.html')
+
+function getViewerURL (torrentUrl) {
+  return VIEWER_URL + '#' + encodeURIComponent(torrentUrl)
+}
+
 // Connects to the BitTorrent network
 // Communicates with the WebTorrentRemoteClients via message passing
 let server = null
@@ -23,7 +31,7 @@ function init (state, action) {
     channels[msg.clientKey] = e.sender
     server.receive(msg)
   })
-
+  setupFiltering()
   return state
 }
 
@@ -43,6 +51,64 @@ function send (msg) {
   channel.send(messages.TORRENT_MESSAGE, msg)
 }
 
+function setupFiltering () {
+  Filtering.registerHeadersReceivedFilteringCB(function (details, isPrivate) {
+    if (details.method !== 'GET') {
+      return {}
+    }
+    if (!isTorrentFile(details)) {
+      return {}
+    }
+
+    var viewerUrl = getViewerURL(details.url)
+
+    return {
+      responseHeaders: {
+        'Location': [ viewerUrl ]
+      },
+      statusLine: 'HTTP/1.1 301 Moved Permanently',
+      resourceName: 'webtorrent'
+    }
+  })
+}
+
+/**
+ * Check if the request is a torrent file.
+ * @param {Object} details First argument of the webRequest.onHeadersReceived
+ *                         event. The properties "responseHeaders" and "url"
+ *                         are read.
+ * @return {boolean} True if the resource is a torrent file.
+ */
+function isTorrentFile (details) {
+  var header = getHeader(details.responseHeaders, 'content-type')
+  if (header) {
+    var headerValue = header.toLowerCase().split(';', 1)[0].trim()
+    if (headerValue === 'application/x-bittorrent') {
+      return true
+    }
+    if (headerValue === 'application/octet-stream') {
+      if (details.url.toLowerCase().indexOf('.torrent') > 0) {
+        return true
+      }
+      var cdHeader =
+        getHeader(details.responseHeaders, 'content-disposition')
+      if (cdHeader && /\.torrent(["']|$)/i.test(cdHeader)) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
+function getHeader (headers, headerName) {
+  var headerNames = Object.keys(headers)
+  for (var i = 0; i < headerNames.length; ++i) {
+    if (headerNames[i].toLowerCase() === headerName) {
+      return headers[headerNames[i]][0]
+    }
+  }
+}
+
 module.exports = {
   init,
   resourceName: 'webtorrent'
diff --git a/app/extensions/torrent/locales/en-US/app.properties b/app/extensions/torrent/locales/en-US/app.properties
index 1cfc2137536..c714874277a 100644
--- a/app/extensions/torrent/locales/en-US/app.properties
+++ b/app/extensions/torrent/locales/en-US/app.properties
@@ -1,7 +1,7 @@
 startPrompt=Start Downloading "{{name}}"?
 startPromptUntitled=Start Downloading?
 startDownload=Start Download
-saveTorrentFile=Save Torrent File
+saveTorrentFile=Save Torrent File...
 legalNotice=When you start a torrent, its data will be made available to others by means of upload. You are responsible for abiding by your local laws.
 missingFilesList=Click "Start Download" to load the torrent file list.
 loadingFilesList=Loading the torrent file list...
@@ -18,3 +18,5 @@ downloadFile=Save File
 torrentStatus=Torrent Status
 torrentLoadingInfo=Loading torrent info...
 torrentLoadingMedia=Loading...
+copyMagnetLink=Copy Magnet Link
+webtorrentPage=WebTorrent
diff --git a/app/extensions/torrent/webtorrent.html b/app/extensions/torrent/webtorrent.html
index b22cfbe6a17..6826dd3825a 100644
--- a/app/extensions/torrent/webtorrent.html
+++ b/app/extensions/torrent/webtorrent.html
@@ -10,10 +10,10 @@
     <link rel="shortcut icon" type="image/x-icon" href="img/webtorrent-128.png">
     <title data-l10n-id="webtorrentPage"></title>
     <script src="ext/l20n.min.js"></script>
-    <script src='gen/webtorrentPage.entry.js'></script>
     <link rel="localization" href="locales/{locale}/app.properties">
   </head>
   <body>
     <div id="appContainer" />
+    <script src='gen/webtorrentPage.entry.js'></script>
   </body>
 </html>
diff --git a/app/filtering.js b/app/filtering.js
index c604c1667f4..1a05dc115d7 100644
--- a/app/filtering.js
+++ b/app/filtering.js
@@ -287,7 +287,6 @@ function registerForBeforeSendHeaders (session, partition) {
  */
 function registerForHeadersReceived (session, partition) {
   const isPrivate = module.exports.isPrivate(partition)
-  // Note that onBeforeRedirect listener doesn't take a callback
   session.webRequest.onHeadersReceived(function (details, cb) {
     // Using an electron binary which isn't from Brave
     if (shouldIgnoreUrl(details)) {
@@ -306,7 +305,10 @@ function registerForHeadersReceived (session, partition) {
         continue
       }
       if (results.responseHeaders) {
-        cb({responseHeaders: results.responseHeaders})
+        cb({
+          responseHeaders: results.responseHeaders,
+          statusLine: results.statusLine
+        })
         return
       }
     }
diff --git a/js/webtorrent/components/app.js b/js/webtorrent/components/app.js
new file mode 100644
index 00000000000..3af58d12261
--- /dev/null
+++ b/js/webtorrent/components/app.js
@@ -0,0 +1,35 @@
+const React = require('react')
+
+const MediaViewer = require('./mediaViewer')
+const TorrentViewer = require('./torrentViewer')
+
+class App extends React.Component {
+  render () {
+    const {
+      ix,
+      name,
+      torrentId,
+      torrentIdProtocol,
+      torrent,
+      serverUrl,
+      errorMessage
+    } = this.props.store
+
+    if (torrent && ix != null) {
+      return <MediaViewer torrent={torrent} serverUrl={serverUrl} ix={ix} />
+    } else {
+      return (
+        <TorrentViewer
+          name={name}
+          torrentId={torrentId}
+          torrentIdProtocol={torrentIdProtocol}
+          torrent={torrent}
+          serverUrl={serverUrl}
+          errorMessage={errorMessage}
+          dispatch={this.props.dispatch} />
+      )
+    }
+  }
+}
+
+module.exports = App
diff --git a/js/webtorrent/components/mediaViewer.js b/js/webtorrent/components/mediaViewer.js
index 95588155e3d..09ebd41260b 100644
--- a/js/webtorrent/components/mediaViewer.js
+++ b/js/webtorrent/components/mediaViewer.js
@@ -19,16 +19,17 @@ const SUPPORTED_AUDIO_EXTENSIONS = [
 
 module.exports = class MediaViewer extends React.Component {
   render () {
-    const torrent = this.props.torrent
-    const ix = this.props.ix
+    const { torrent, serverUrl, ix } = this.props
+
     const file = torrent.files[ix]
+    const fileURL = serverUrl && (serverUrl + '/' + ix)
+
     const fileExt = file && getExtension(file.name)
     const isVideo = SUPPORTED_VIDEO_EXTENSIONS.includes(fileExt)
     const isAudio = SUPPORTED_AUDIO_EXTENSIONS.includes(fileExt)
-    const fileURL = torrent.serverURL && (torrent.serverURL + '/' + ix)
 
     let content
-    if (torrent.serverURL == null) {
+    if (!file || !serverUrl) {
       content = <div data-l10n-id='torrentLoadingMedia' />
     } else if (isVideo) {
       content = <video src={fileURL} autoPlay controls />
@@ -36,7 +37,8 @@ module.exports = class MediaViewer extends React.Component {
       content = <audio src={fileURL} autoPlay controls />
     } else {
       // For security, sandbox and disallow scripts.
-      // We need allow-same-origin so that the iframe can load from http://localhost:...
+      // We need allow-same-origin so that the iframe can load from
+      // http://localhost:...
       content = <iframe src={fileURL} sandbox='allow-same-origin' />
     }
 
diff --git a/js/webtorrent/components/torrentFileList.js b/js/webtorrent/components/torrentFileList.js
index c837139d442..4df5619b4fb 100644
--- a/js/webtorrent/components/torrentFileList.js
+++ b/js/webtorrent/components/torrentFileList.js
@@ -4,7 +4,7 @@ const SortableTable = require('../../components/sortableTable')
 
 class TorrentFileList extends React.Component {
   render () {
-    const torrent = this.props.torrent
+    const { torrent, stateOwner } = this.props
     const files = torrent && torrent.files
 
     let content
@@ -27,7 +27,7 @@ class TorrentFileList extends React.Component {
           rowObjects={files}
           columnClassNames={['num', 'name', 'downloadFile', 'size']}
           addHoverClass
-          stateOwner={this.props.stateOwner} />
+          stateOwner={stateOwner} />
       ]
     }
 
@@ -40,18 +40,21 @@ class TorrentFileList extends React.Component {
   }
 
   renderFileLink (file, isDownload) {
-    const { torrent, torrentID } = this.props
+    const { torrentId, torrent, serverUrl } = this.props
     const ix = torrent.files.indexOf(file)
     if (isDownload) {
-      if (torrent.serverURL) {
-        const httpURL = torrent.serverURL + '/' + ix
+      if (serverUrl) {
+        const httpURL = serverUrl + '/' + ix
         return <a href={httpURL} download={file.name}>⇩</a>
       } else {
         return <div /> // No download links until the server is ready
       }
     } else {
-      const magnetURL = torrentID + '&ix=' + ix
-      return <a href={magnetURL}>{file.name}</a>
+      const suffix = /^https?:/.test(torrentId)
+        ? '#ix=' + ix
+        : '&ix=' + ix
+      const href = torrentId + suffix
+      return <a href={href}>{file.name}</a>
     }
   }
 }
diff --git a/js/webtorrent/components/torrentViewer.js b/js/webtorrent/components/torrentViewer.js
index 94b7544c469..bb829c365eb 100644
--- a/js/webtorrent/components/torrentViewer.js
+++ b/js/webtorrent/components/torrentViewer.js
@@ -12,9 +12,18 @@ class TorrentViewer extends React.Component {
   }
 
   render () {
-    const {torrent, torrentID, name, errorMessage, dispatch} = this.props
+    const {
+      name,
+      torrentId,
+      torrent,
+      serverUrl,
+      errorMessage,
+      torrentIdProtocol,
+      dispatch
+    } = this.props
+
+    let titleElem, mainButtonId, saveButton
 
-    let titleElem, mainButtonId
     if (torrent) {
       if (name) {
         // No localization, just use the torrent name
@@ -36,6 +45,24 @@ class TorrentViewer extends React.Component {
       mainButtonId = 'startDownload'
     }
 
+    if (torrentIdProtocol === 'magnet:') {
+      saveButton = (
+        <Button
+          l10nId='copyMagnetLink'
+          className='whiteButton copyMagnetLink'
+          onClick={() => dispatch('copyMagnetLink')}
+        />
+      )
+    } else {
+      saveButton = (
+        <Button
+          l10nId='saveTorrentFile'
+          className='whiteButton saveTorrentFile'
+          onClick={() => dispatch('saveTorrentFile')}
+        />
+      )
+    }
+
     const legalNotice = torrent != null
       ? <a className='legalNotice' data-l10n-id='poweredByWebTorrent' href='https://webtorrent.io' target='_blank' />
       : <div className='legalNotice' data-l10n-id='legalNotice' />
@@ -49,20 +76,20 @@ class TorrentViewer extends React.Component {
               l10nId={mainButtonId}
               className='primaryButton mainButton'
               disabled={!!torrent}
-              onClick={() => dispatch('start')} />
-            <Button
-              l10nId='saveTorrentFile'
-              className='whiteButton saveTorrentFile'
-              onClick={() => dispatch('saveTorrentFile')} />
+              onClick={() => dispatch('start')}
+            />
+            {saveButton}
           </div>
         </div>
 
         <div className='siteDetailsPageContent'>
           <TorrentStatus torrent={torrent} errorMessage={errorMessage} />
           <TorrentFileList
+            torrentId={torrentId}
             torrent={torrent}
+            serverUrl={serverUrl}
             stateOwner={this}
-            torrentID={torrentID} />
+          />
           {legalNotice}
         </div>
       </div>
diff --git a/js/webtorrent/entry.js b/js/webtorrent/entry.js
index 026dd7a9543..495062bc9dc 100644
--- a/js/webtorrent/entry.js
+++ b/js/webtorrent/entry.js
@@ -1,148 +1,178 @@
-/* global Blob, URL */
-
 const ipc = window.chrome.ipcRenderer
-const messages = require('../constants/messages')
+
+const clipboardCopy = require('clipboard-copy')
 const parseTorrent = require('parse-torrent')
+const path = require('path')
+const querystring = require('querystring')
 const React = require('react')
 const ReactDOM = require('react-dom')
+const url = require('url')
 const WebTorrentRemoteClient = require('webtorrent-remote/client')
 
-// React Components
-const MediaViewer = require('./components/mediaViewer')
-const TorrentViewer = require('./components/torrentViewer')
+const App = require('./components/app')
+const messages = require('../constants/messages')
 
 // Stylesheets
 require('../../less/webtorrent.less')
 require('../../node_modules/font-awesome/css/font-awesome.css')
 
-// UI state object. Pure function from `state` -> React element.
-const state = {
-  torrentID: window.decodeURIComponent(window.location.hash.substring(1)),
-  parsedTorrent: null,
-  client: null,
+// Pure function from state -> React elements.
+const store = {
+  name: null, // Torrent name
+  ix: null, // Selected file index
+  torrentId: window.decodeURIComponent(window.location.hash.substring(1)),
+  torrentIdProtocol: null,
   torrent: null,
+  serverUrl: null,
   errorMessage: null
 }
-window.state = state /* for easier debugging */
 
-state.parsedTorrent = parseTorrent(state.torrentID)
+let client, server
+
+init()
+
+function init () {
+  const parsedUrl = url.parse(store.torrentId)
+  store.torrentIdProtocol = parsedUrl.protocol
+
+  // `ix` param can be set by query param or hash, e.g. ?ix=1 or #ix=1
+  if (parsedUrl.protocol === 'http:' || parsedUrl.protocol === 'https:') {
+    store.name = path.basename(parsedUrl.pathname)
+    store.ix = getIxQuery(parsedUrl)
+    if (store.ix == null) store.ix = getIxHash(parsedUrl)
+  } else if (parsedUrl.protocol === 'magnet:') {
+    let parsedTorrent
+    try {
+      parsedTorrent = parseTorrent(store.torrentId)
+    } catch (err) {
+      return onError(new Error('Invalid torrent identifier'))
+    }
+    store.name = parsedTorrent.name
+    store.ix = parsedTorrent.ix
+    if (store.ix == null) store.ix = getIxHash(parsedUrl)
+  } else {
+    return onError(new Error('Invalid torrent identifier'))
+  }
+
+  // Create the client, set up IPC to the WebTorrentRemoteServer
+  client = new WebTorrentRemoteClient(send)
+  client.on('warning', onWarning)
+  client.on('error', onError)
+
+  ipc.on(messages.TORRENT_MESSAGE, function (e, msg) {
+    client.receive(msg)
+  })
+
+  // Check whether we're already part of this swarm. If not, show a Start button.
+  client.get(store.torrentId, function (err, torrent) {
+    if (!err) initTorrent(torrent)
+    update()
+  })
+
+  // Clean up the client. Note: Since this does IPC, it's not guaranteed to send
+  // before the page is closed. But that's okay; webtorrent-remote expects regular
+  // heartbeats and assumes clients are dead after 30s without one. So basically,
+  // this is an optimization to destroy the client sooner.
+  window.addEventListener('beforeunload', function () {
+    client.destroy()
+  })
+
+  // Update the UI (to show download speed) every 1s.
+  update()
+  setInterval(update, 1000)
+}
 
-// Create the client, set up IPC to the WebTorrentRemoteServer
-state.client = new WebTorrentRemoteClient(send)
-state.client.on('warning', onWarning)
-state.client.on('error', onError)
+function getIxQuery (parsedUrl) {
+  const ix = Number(querystring.parse(parsedUrl.query).ix)
+  return Number.isNaN(ix) ? null : ix
+}
 
-ipc.on(messages.TORRENT_MESSAGE, function (e, msg) {
-  state.client.receive(msg)
-})
+function getIxHash (parsedUrl) {
+  const ix = Number(querystring.parse((parsedUrl.hash || '').slice(1)).ix)
+  return Number.isNaN(ix) ? null : ix
+}
 
 function send (msg) {
   ipc.send(messages.TORRENT_MESSAGE, msg)
 }
 
-// Clean up the client before the window exits
-window.addEventListener('beforeunload', function () {
-  state.client.destroy({delay: 1000})
-})
-
-// Check whether we're already part of this swarm. If not, show a Start button.
-state.client.get(state.torrentID, function (err, torrent) {
-  if (!err) {
-    state.torrent = torrent
-    addTorrentEvents(torrent)
-  }
-  render()
-})
+function update () {
+  const elem = <App store={store} dispatch={dispatch} />
+  ReactDOM.render(elem, document.querySelector('#appContainer'))
+  document.title = store.name || 'WebTorrent'
+}
 
-// Page starts blank, once you call render() it shows a continuously updating torrent UI
-function render () {
+function onServerListening () {
+  store.serverUrl = 'http://localhost:' + server.address().port
   update()
-  setInterval(update, 1000)
 }
 
-function update () {
-  const elem = <App />
-  ReactDOM.render(elem, document.querySelector('#appContainer'))
-}
+function initTorrent (torrent) {
+  store.torrent = torrent
+
+  // Once torrent's canonical name is available, use it
+  if (torrent.name) {
+    store.name = torrent.name
+  }
 
-function addTorrentEvents (torrent) {
   torrent.on('warning', onWarning)
   torrent.on('error', onError)
-}
 
-function onWarning (err) {
-  console.warn(err.message)
-}
+  server = torrent.createServer()
+  server.listen(onServerListening)
 
-function onError (err) {
-  state.errorMessage = err.message
+  // These event listeners aren't strictly required, but it's better to update the
+  // UI immediately when important events happen instead of waiting for the regular
+  // update() call that happens on a 1 second interval.
+  torrent.on('infohash', update)
+  torrent.on('metadata', update)
+  torrent.on('done', update)
 }
 
-function start () {
-  state.client.add(state.torrentID, onAdded, {server: {}})
+function dispatch (action) {
+  switch (action) {
+    case 'start':
+      return start()
+    case 'saveTorrentFile':
+      return saveTorrentFile()
+    case 'copyMagnetLink':
+      return copyMagnetLink()
+    default:
+      console.error('Ignoring unknown dispatch type: ' + JSON.stringify(action))
+  }
 }
 
-function onAdded (err, torrent) {
-  if (err) {
-    state.errorMessage = err.message
-    return console.error(err)
-  }
-  state.torrent = torrent
-  addTorrentEvents(torrent)
-  update()
+function start () {
+  client.add(store.torrentId, function (err, torrent) {
+    if (err) return onError(err)
+    initTorrent(torrent)
+    update()
+  })
 }
 
 function saveTorrentFile () {
-  let parsedTorrent = parseTorrent(state.torrentID)
-  let torrentFile = parseTorrent.toTorrentFile(parsedTorrent)
-
-  let torrentFileName = state.parsedTorrent.name + '.torrent'
-  let torrentFileBlobURL = URL.createObjectURL(
-    new Blob([torrentFile],
-    { type: 'application/x-bittorrent' }
-  ))
-
   let a = document.createElement('a')
   a.target = '_blank'
-  a.download = torrentFileName
-  a.href = torrentFileBlobURL
+  a.download = true
+  a.href = store.torrentId
   a.click()
 }
 
-class App extends React.Component {
-  constructor () {
-    super()
-    this.dispatch = this.dispatch.bind(this)
-  }
+function copyMagnetLink () {
+  clipboardCopy(store.torrentId)
+}
 
-  dispatch (action) {
-    switch (action) {
-      case 'start':
-        return start()
-      case 'saveTorrentFile':
-        return saveTorrentFile()
-      default:
-        console.error('Ignoring unknown dispatch type: ' + JSON.stringify(action))
-    }
-  }
+function onWarning (err) {
+  console.warn(err.message)
+}
 
-  render () {
-    const {torrent, torrentID, errorMessage, parsedTorrent} = state
-    const ix = parsedTorrent && parsedTorrent.ix // Selected file index
-    let name = parsedTorrent && parsedTorrent.name
-    if (name) document.title = name
-
-    if (state.torrent && ix != null) {
-      return <MediaViewer torrent={torrent} ix={ix} />
-    } else {
-      return (
-        <TorrentViewer
-          name={name}
-          torrent={torrent}
-          torrentID={torrentID}
-          errorMessage={errorMessage}
-          dispatch={this.dispatch} />
-      )
-    }
-  }
+function onError (err) {
+  store.errorMessage = err.message
+  console.error(err.message)
+  update()
 }
+
+/* for easier debugging */
+window.store = store
+window.client = client
+window.server = server
diff --git a/package.json b/package.json
index 3c0a40f192b..ca05ccf69ff 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "ad-block": "^2.0.0",
     "aphrodite": "^1.0.0",
     "async": "^2.0.1",
+    "clipboard-copy": "^1.0.0",
     "electron-localshortcut": "^0.6.0",
     "electron-prebuilt": "brave/electron-prebuilt",
     "electron-squirrel-startup": "brave/electron-squirrel-startup",
@@ -123,7 +124,7 @@
     "tracking-protection": "1.1.x",
     "underscore": "1.8.3",
     "url-loader": "^0.5.7",
-    "webtorrent-remote": "^1.0.0"
+    "webtorrent-remote": "^2.0.0"
   },
   "devDependencies": {
     "asar": "^0.11.0",