diff --git a/templates/database/designer/main.twig b/templates/database/designer/main.twig
index d075a4c72e..5c336775c1 100644
--- a/templates/database/designer/main.twig
+++ b/templates/database/designer/main.twig
@@ -108,9 +108,7 @@ var designerConfig = {{ designer_config|raw }};
                 {% trans 'Reload' %}
             </span>
         </a>
-        <a href="{{ get_docu_link('faq', 'faq6-31') }}"
-           target="documentation"
-           class="M_butt">
+        <a href="{{ get_docu_link('faq', 'faq6-31') }}" target="_blank" rel="noopener noreferrer" class="M_butt">
             <img title="{% trans 'Help' %}"
                  src="{{ theme.getImgPath('designer/help.png') }}">
             <span class="hide hidable">
diff --git a/templates/navigation/main.twig b/templates/navigation/main.twig
index 6f8701f592..cb001d5cad 100644
--- a/templates/navigation/main.twig
+++ b/templates/navigation/main.twig
@@ -32,7 +32,7 @@
             </a>
           {% endif %}
 
-          <a href="{{ get_docu_link('index') }}" title="{% trans 'phpMyAdmin documentation' %}" target="_blank" rel="noopener">
+          <a href="{{ get_docu_link('index') }}" title="{% trans 'phpMyAdmin documentation' %}" target="_blank" rel="noopener noreferrer">
             {{- get_image('b_docs', 'phpMyAdmin documentation'|trans) -}}
           </a>
 
diff --git a/templates/preferences/header.twig b/templates/preferences/header.twig
index fd07aa538d..f82bc3d517 100644
--- a/templates/preferences/header.twig
+++ b/templates/preferences/header.twig
@@ -56,7 +56,7 @@
   {% endif %}
 
   {% if not has_config_storage %}
-    {% apply format('<a href="' ~ get_docu_link('setup', 'linked-tables') ~ '">', '</a>')|notice %}
+    {% apply format('<a href="' ~ get_docu_link('setup', 'linked-tables') ~ '" target="_blank" rel="noopener noreferrer">', '</a>')|notice %}
       {% trans 'Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.' %}
     {% endapply %}
   {% endif %}