diff --git a/docs/pelicanconf.py b/docs/pelicanconf.py
index aaf822b..b719d18 100644
--- a/docs/pelicanconf.py
+++ b/docs/pelicanconf.py
@@ -39,6 +39,12 @@ USE_FOLDER_AS_CATEGORY = False
 MAIN_MENU = True
 HOME_HIDE_TAGS = True
 
+# Valid values for LINKS_IN_NEW_TAB:
+# * Unset, None, True or any string to open all LINKS in a new window (default)
+# * 'no', 'none', False or 0 to open all LINKS in the same window
+# * 'external' to open LINKS to external sites in a new window, internal links in same window
+LINKS_IN_NEW_TAB = 'external'
+
 SOCIAL = (
     ('github', 'https://github.com/alexandrevicenzi/Flex'),
     ('rss', '/blog/feeds/all.atom.xml'),
diff --git a/templates/base.html b/templates/base.html
index bd85276..eb18b29 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -107,18 +107,24 @@
       {% if pages or LINKS %}
       <nav>
         <ul class="list">
+          {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #}
+          {% macro link_target(link) -%}
+            {% if LINKS_IN_NEW_TAB not in ('no', 'none', false, 0, 'external') or (LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL)) %}
+            target="_blank"
+            {% endif %}
+          {% endmacro %}
+
           {% if PAGES_SORT_ATTRIBUTE -%}
             {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
           {%- endif %}
           {% if DISPLAY_PAGES_ON_MENU %}
           {% for page in pages %}
-          <li><a href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
+            <li><a {{ link_target(SITEURL) }} href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
           {% endfor %}
           {% endif %}
 
           {% for name, link in LINKS %}
-            {# Open external links in new window, relative links in the same window #}
-            <li><a href="{{ link }}" {% if link[0] != '/' and not link.startswith(SITEURL) %}target="_blank"{% endif %}>{{ name }}</a></li>
+            <li><a {{ link_target(link) }} href="{{ link }}" >{{ name }}</a></li>
           {% endfor %}
         </ul>
       </nav>