diff --git a/src/ui/torrent_details.js b/src/ui/torrent_details.js
index 8c0f257..6f648c2 100644
--- a/src/ui/torrent_details.js
+++ b/src/ui/torrent_details.js
@@ -34,9 +34,13 @@ function File({ file }) {
   return (
     <tr>
       <td>
-        <a href={dlURI(uri, password, file.id)} target="_new">
-          {file.path}
-        </a>
+        {
+          file.progress == 1.0
+            ? <a href={dlURI(uri, password, file.id)} target="_new">
+                {file.path}
+              </a>
+            : file.path
+        }
       </td>
       <td>{file.priority}</td>
       <td>{file.availability}</td>
@@ -176,7 +180,7 @@ class Torrent extends Component {
             <CardBlock>
               <table className="table table-striped" style={{marginBottom: "0"}}>
                 <tbody>
-                  {files.map(file => <File file={file} />)}
+                  {files.slice().sort((a, b) => a.path.localeCompare(b.path)).map(file => <File file={file} />)}
                 </tbody>
               </table>
             </CardBlock>
diff --git a/src/ui/torrent_table.js b/src/ui/torrent_table.js
index d22dfce..e62d5ff 100644
--- a/src/ui/torrent_table.js
+++ b/src/ui/torrent_table.js
@@ -33,7 +33,7 @@ class TorrentTable extends Component {
           </tr>
         </thead>
         <tbody>
-          {Object.values(torrents).map(t =>
+          {Object.values(torrents).slice().sort((a, b) => a.name.localeCompare(b.name)).map(t =>
             <tr
               key={t.id}
               className={`torrent ${