diff --git a/bukuserver/templates/bukuserver/lib.html b/bukuserver/templates/bukuserver/lib.html
index 9157be52..7dcb9bff 100644
--- a/bukuserver/templates/bukuserver/lib.html
+++ b/bukuserver/templates/bukuserver/lib.html
@@ -5,7 +5,7 @@
 {% endmacro %}
 
 {% macro close_if_popup() %}
-  <script>close(); /* closes if in popup window */</script>
+  <script>opener && (opener !== window) && close()</script>
 {% endmacro %}
 
 {% macro limit_navigation_if_popup() %}