diff --git a/webapp/common.js b/webapp/common.js
index f99fc1b..5a9a321 100644
--- a/webapp/common.js
+++ b/webapp/common.js
@@ -38,9 +38,12 @@ function setWindow(window, back) {
     if (back) {
         backButton
           .click(() => {clearStatus(); setWindow(back); return false;})
-          .removeAttr('href')
           .removeClass('button-hidden');
-    } else if (history.length == 1) {
+    } else if (history.length > 1) {
+        backButton
+          .click(() => {clearStatus(); history.back(); return false;})
+          .removeClass('button-hidden');
+    } else {
         backButton.addClass('button-hidden');
     }