diff --git a/src/index.js b/src/index.js
index 1e08329..9e349e8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -33,3 +33,7 @@ ws_init(() => {
       </ConnectedRouter>
     </Provider>, root);
 });
+
+navigator.registerProtocolHandler("magnet",
+  window.location.origin + "/add-torrent/%s",
+  "Open magnet link with receptor");
diff --git a/src/ui/add_torrent.js b/src/ui/add_torrent.js
index f525ad4..1845ce9 100644
--- a/src/ui/add_torrent.js
+++ b/src/ui/add_torrent.js
@@ -144,6 +144,8 @@ class AddTorrent extends Component {
       loading: false,
       customize: false,
       file: null,
+      magnet: null,
+      useMagnet: false,
       torrent: null,
       files: [],
       startImmediately: true,
@@ -153,6 +155,14 @@ class AddTorrent extends Component {
     };
   }
 
+  componentDidMount() {
+    let { magnet } = this.props.match.params;
+    if (magnet) {
+      magnet = decodeURIComponent(magnet);
+      this.setState({ magnet, useMagnet: true });
+    }
+  }
+
   async handleTransferOffer(offer, file) {
     const headers = new Headers();
     headers.append("Authorization", "Bearer " + offer.token);
@@ -200,16 +210,13 @@ class AddTorrent extends Component {
 
   uploadFile() {
     this.setState({ loading: true });
-    const { file, startImmediately } = this.state;
+    const { magnet, file, startImmediately } = this.state;
     const { dispatch } = this.props;
     const customize = // TODO: File options
       this.state.priority !== 3 ||
       this.state.uploadThrottle !== -1 ||
       this.state.downloadThrottle !== -1;
-    ws_send("UPLOAD_TORRENT", {
-      size: file.size,
-      start: startImmediately && !customize
-    }, async offer => {
+    const handleOffer = async offer => {
       switch (offer.type) {
         case "TRANSFER_OFFER":
           return await this.handleTransferOffer(offer, file);
@@ -218,7 +225,18 @@ class AddTorrent extends Component {
           this.applyOptions.bind(this)(id);
           break;
       }
-    });
+    };
+    if (magnet) {
+      ws_send("UPLOAD_MAGNET", {
+        uri: magnet,
+        start: startImmediately && !customize
+      }, handleOffer);
+    } else {
+      ws_send("UPLOAD_TORRENT", {
+        size: file.size,
+        start: startImmediately && !customize
+      }, handleOffer);
+    }
   }
 
   processTorrent(torrent) {
@@ -303,7 +321,7 @@ class AddTorrent extends Component {
   }
 
   renderTorrent() {
-    const { torrent, file, files, loading } = this.state;
+    const { magnet, torrent, file, files, loading } = this.state;
 
     const details = {
       "comment": d => d,
@@ -313,35 +331,39 @@ class AddTorrent extends Component {
 
     return (
       <Card style={{marginBottom: "1rem"}}>
-        <CardBlock>
-          <CardTitle>{file.name}</CardTitle>
-          <CardText>
-            <dl style={{marginBottom: "0"}}>
-              {Object.keys(details).map(key =>
-                torrent[key] && (
-                  <div>
-                    <dt>{key}</dt>
-                    <dd>{details[key](torrent[key])}</dd>
-                  </div>
-                )
-              )}
-            </dl>
-          </CardText>
-        </CardBlock>
+        {torrent &&
+          <CardBlock>
+            <CardTitle>{magnet && "Magnet link" || file.name}</CardTitle>
+              <CardText>
+              <dl style={{marginBottom: "0"}}>
+                {Object.keys(details).map(key =>
+                  torrent[key] && (
+                    <div>
+                      <dt>{key}</dt>
+                      <dd>{details[key](torrent[key])}</dd>
+                    </div>
+                  )
+                )}
+              </dl>
+            </CardText>
+          </CardBlock>
+        }
         <ToggleContainer className="form-group" title="Options">
           {this.renderOptions.bind(this)()}
         </ToggleContainer>
-        <ToggleContainer className="form-group" title="Files">
-          <Card>
-            <CardBlock>
-              TODO
-            </CardBlock>
-          </Card>
-        </ToggleContainer>
+        {torrent &&
+          <ToggleContainer className="form-group" title="Files">
+            <Card>
+              <CardBlock>
+                TODO
+              </CardBlock>
+            </Card>
+          </ToggleContainer>
+        }
         <button
           type="button"
           className="btn btn-primary btn-block"
-          disabled={file === null || loading}
+          disabled={(file || magnet) && loading}
           onClick={this.uploadFile.bind(this)}
         >Add torrent</button>
         {loading ?
@@ -360,7 +382,14 @@ class AddTorrent extends Component {
     return (
       <div>
         <h3>Add torrent</h3>
-        {this.state.torrent && this.renderTorrent.bind(this)()}
+        {this.state.magnet && this.state.useMagnet &&
+          <p style={{
+            textOverflow: "ellipsis",
+            overflowX: "hidden",
+            whiteSpace: "nowrap"
+          }}>{this.state.magnet}</p>
+        }
+        {(this.state.torrent || this.state.magnet) && this.renderTorrent.bind(this)()}
         <div className="form-group">
           <input
             style={{display: "none"}}
@@ -368,7 +397,7 @@ class AddTorrent extends Component {
             accept=".torrent"
             onChange={this.handleFile.bind(this)}
           />
-          {this.state.torrent ?
+          {!this.state.useMagnet && (this.state.torrent ?
             <div style={{
               display: "flex",
               flexDirection: "column",
@@ -381,12 +410,35 @@ class AddTorrent extends Component {
               >Select a different torrent?</button>
             </div>
           :
-            <button
-              type="button"
-              className="btn btn-default btn-block"
-              onClick={() => findDOMNode(this).querySelector("input[type='file']").click()}
-            >Select torrent</button>
-          }
+            <div>
+              <button
+                type="button"
+                className="btn btn-default btn-block"
+                onClick={() => findDOMNode(this).querySelector("input[type='file']").click()}
+              >Select torrent</button>
+              <div className="text-centered" style={{margin: "1rem auto"}}>
+                - or -
+              </div>
+              <FormGroup>
+                <Input
+                  type="text"
+                  placeholder="Magnet link"
+                  value={this.state.magnet}
+                  onChange={e => this.setState({ magnet: e.target.value })}
+                />
+              </FormGroup>
+              <button
+                type="button"
+                className="btn btn-default btn-block"
+                onClick={() => this.setState({ useMagnet: true })}
+                disabled={(() => {
+                  const a = document.createElement("a");
+                  a.href = this.state.magnet;
+                  return a.protocol !== "magnet:";
+                })()}
+              >Add magnet</button>
+            </div>
+          )}
         </div>
       </div>
     );
diff --git a/src/ui/main.js b/src/ui/main.js
index 9b8c8ee..dc206f9 100644
--- a/src/ui/main.js
+++ b/src/ui/main.js
@@ -13,7 +13,8 @@ export default class Main extends Component {
           <TorrentTable />
         </div>
         <div className="col-md-4">
-          <Route path="/add-torrent" component={AddTorrent} />
+          <Route exact path="/add-torrent" component={AddTorrent} />
+          <Route path="/add-torrent/:magnet" component={AddTorrent} />
           <Route path="/torrents/:ids" component={TorrentDetails} />
           <Route exact path="/" component={Server} />
         </div>