diff --git a/nyaa/routes.py b/nyaa/routes.py
index 952f19e..419320e 100644
--- a/nyaa/routes.py
+++ b/nyaa/routes.py
@@ -745,6 +745,7 @@ def redirect_magnet(torrent_id):
 
 
 @app.route('/view/<int:torrent_id>/torrent')
+@app.route('/download/<int:torrent_id>.torrent')
 def download_torrent(torrent_id):
     torrent = models.Torrent.by_id(torrent_id)
 
@@ -753,7 +754,7 @@ def download_torrent(torrent_id):
 
     resp = flask.Response(_get_cached_torrent_file(torrent))
     resp.headers['Content-Type'] = 'application/x-bittorrent'
-    resp.headers['Content-Disposition'] = 'inline; filename*=UTF-8\'\'{}'.format(
+    resp.headers['Content-Disposition'] = 'inline; filename="{0}"; filename*=UTF-8\'\'{0}'.format(
         quote(torrent.torrent_name.encode('utf-8')))
 
     return resp
diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html
index 70b9565..bef4690 100644
--- a/nyaa/templates/view.html
+++ b/nyaa/templates/view.html
@@ -68,7 +68,7 @@
 		</div>
 	</div>
 	<div class="panel-footer">
-		{% if torrent.has_torrent %}<a href="/view/{{ torrent.id }}/torrent"><i class="fa fa-download fa-fw"></i>Download Torrent</a> or {% endif %}<a href="{{ torrent.magnet_uri }}" class="card-footer-item"><i class="fa fa-magnet fa-fw"></i>Magnet</a>
+		{% if torrent.has_torrent %}<a href="{{ url_for('download_torrent', torrent_id=torrent.id )}}"><i class="fa fa-download fa-fw"></i>Download Torrent</a> or {% endif %}<a href="{{ torrent.magnet_uri }}" class="card-footer-item"><i class="fa fa-magnet fa-fw"></i>Magnet</a>
 	</div>
 </div>