diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js
index dd71c282..2f8b830d 100644
--- a/src/c3nav/site/static/site/js/c3nav.js
+++ b/src/c3nav/site/static/site/js/c3nav.js
@@ -1275,9 +1275,12 @@ c3nav = {
             history.back();
         }
     },
+    _href_modal_open_tab: function(location) {
+        return ['/l/', '/control/', '/reports/', '/mesh/', '/positions/', '/api-secrets/', '/editor/'].some(prefix => location.startsWith(prefix));
+    },
     _modal_link_click: function(e) {
         var location = $(this).attr('href');
-        if ($(this).is('[target]') || location.startsWith('/control/')) {
+        if ($(this).is('[target]') || c3nav._href_modal_open_tab(location)) {
             $(this).attr('target', '_blank');
             return;
         }
diff --git a/src/c3nav/site/templates/site/account.html b/src/c3nav/site/templates/site/account.html
index 03cbbbda..12ea4588 100644
--- a/src/c3nav/site/templates/site/account.html
+++ b/src/c3nav/site/templates/site/account.html
@@ -42,10 +42,10 @@
 
     <hr>
     <p>
-        <a class="button" target="_blank" href="{% url 'site.position_list' %}">{% trans 'Manage custom positions' %}</a>
+        <a class="button" href="{% url 'site.position_list' %}">{% trans 'Manage custom positions' %}</a>
     </p>
     <p>
-        <a class="button" target="_blank" href="{% url 'site.api_secret_list' %}">{% trans 'Manage API secrets' %}</a>
+        <a class="button" href="{% url 'site.api_secret_list' %}">{% trans 'Manage API secrets' %}</a>
     </p>
 
     <hr>