diff --git a/frontend/src/download.js b/frontend/src/download.js
index 4f1d40b5..f0a5aea7 100644
--- a/frontend/src/download.js
+++ b/frontend/src/download.js
@@ -6,9 +6,9 @@ require('jquery-circle-progress');
 const Raven = window.Raven;
 $(document).ready(function() {
   $('#download-progress').hide();
-  $('.send-new').click(() => {
-    window.location.replace(`${window.location.origin}`);
-  });
+  //link back to homepage
+  $('.send-new').attr('href', window.location.origin);
+
   const filename = $('#dl-filename').html();
 
   //initiate progress bar
diff --git a/frontend/src/upload.js b/frontend/src/upload.js
index 555b7961..9527489a 100644
--- a/frontend/src/upload.js
+++ b/frontend/src/upload.js
@@ -68,17 +68,8 @@ $(document).ready(function() {
     fill: '#3B9DFF',
     size: 158
   });
-  // link back to home page
-  $('.send-new').click(() => {
-    $('#upload-progress').hide();
-    $('#share-link').hide();
-    $('#upload-error').hide();
-    $copyBtn.attr('disabled', false);
-    $('#link').attr('disabled', false);
-    $copyBtn.html('Copy to Clipboard');
-    $('.upload-window').removeClass('ondrag');
-    $('#page-one').show();
-  });
+  //link back to homepage
+  $('.send-new').attr('href', window.location);
 
   // on file upload by browse or drag & drop
   function onUpload(event) {
diff --git a/views/download.handlebars b/views/download.handlebars
index 4eca5e3c..bf47cf68 100644
--- a/views/download.handlebars
+++ b/views/download.handlebars
@@ -38,9 +38,9 @@
       </div>
     </div>
 
-    <div class="send-new" title="Try Firefox Send">
+    <a class="send-new" title="Try Firefox Send">
       Try Firefox Send
-    </div>
+    </a>
     {{else}}
     <div class="title">
       This link has expired or never existed in the first place.
@@ -52,9 +52,9 @@
     <div class="expired-description">
       Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
     </div>
-    <div class="send-new" title="Try Firefox Send">
+    <a class="send-new" title="Try Firefox Send">
       Try Firefox Send
-    </div>
+    </a>
     {{/if}}
   </div>
 </div>
diff --git a/views/index.handlebars b/views/index.handlebars
index 8dde3b8e..121e9d85 100644
--- a/views/index.handlebars
+++ b/views/index.handlebars
@@ -74,9 +74,9 @@
         <button id="copy-btn" title="Copy to Clipboard">Copy to Clipboard</button>
       </div>
       <button id="delete-file" title="Delete file">Delete file</button>
-      <div class="send-new" title="Send another file">
+      <a class="send-new" title="Send another file">
         Send another file
-      </div>
+      </a>
     </div>
   </div>
 
@@ -88,9 +88,9 @@
       There has been an error uploading the file.
     </div>
     <img id="upload-error-img" src="/resources/illustration_error.svg" alt="Upload error" />
-    <div class="send-new" title="Send another file">
+    <a class="send-new" title="Send another file">
       Send another file
-    </div>
+    </a>
   </div>
 
   <div id="unsupported-browser">