diff --git a/templates/shortcodes/button.html b/templates/shortcodes/button.html
index c524eb132..420ede929 100644
--- a/templates/shortcodes/button.html
+++ b/templates/shortcodes/button.html
@@ -3,18 +3,27 @@
 {% set path = body | split(pat="href=") | slice(start=1) | first | split(pat=">") | first | trim_start_matches(pat='"')
 | trim_end_matches(pat='"') %}
 
+<p>{{path}}</p>
 {% if 'https' in path %}
 <button onclick="window.open('{{path}}', '_blank');"
     class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
     {{ body | trim_start_matches(pat="<p>") | safe}}
 </button>
 
-{% elif base is containing("www_threefold_io") or path is containing("/") %}
+{% elif base is containing("www_threefold_io") %}
 {% set btn_path = base ~ path %}
-<button onclick="window.location='{{btn_path}}'"
+<button onclick="if(event.preventDefault) event.preventDefault(); window.location='{{btn_path}}'"
+    class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
+    {{ body | trim_start_matches(pat="<p>") | safe}}
+</button>
+
+{% elif path is starting_with("/") %}
+{% set btn_path = base ~ path %}
+<button onclick="if(event.preventDefault) event.preventDefault(); window.location='{{btn_path}}'"
     class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
     {{ body | trim_start_matches(pat="<p>") | safe}}
     </button>
+
 {% else %}
 <button onclick="window.location='{{path}}'"
     class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">