diff --git a/bookmark/index.html b/bookmark/index.html
index 792fd06..7092542 100644
--- a/bookmark/index.html
+++ b/bookmark/index.html
@@ -20,7 +20,7 @@
 			to add this <span class="type"></span> to your bookmarks.
 		</p>
 		<p>Next time you open the bookmark, the <span class="type"></span> will automatically be opened.</p>
-		<a href="/">Back</a> &nbsp; <a id="open-popup" href="javascript:void(0);">Open Popup Now</a>
+		<a id="back" href="javascript:void(0);">Back</a> &nbsp; <a id="open-popup" href="javascript:void(0);">Open Popup Now</a>
 	</body>
 </html>
 
diff --git a/bookmark/script.js b/bookmark/script.js
index 7f0053e..6f562ef 100644
--- a/bookmark/script.js
+++ b/bookmark/script.js
@@ -14,13 +14,18 @@ if (navigator.platform.match(/Mac/i)) {
 });
 
 document.getElementById("open-popup").onclick = function() {
-
 	window.open(
 		popupLink,
 		"PopupTimer" + Date.now(),
 		"width=250,height=100,menubar=no,toolbar=no,location=no,status=no,resizable=no,scrollbars=no"
 	);
+}
 
+document.getElementById("back").onclick = function() {
+	if (window.opener)
+		window.close();
+	else
+		location.href = "/";
 }
 
 function parseQueryParams() {