diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html
index d1af4f0c..48a09e09 100644
--- a/templates/components/tooltip.html
+++ b/templates/components/tooltip.html
@@ -2,8 +2,8 @@
 
 {% macro Tooltip(message,title='Help') -%}
 
-  <span class="icon-tooltip" v-tooltip.top="{content: '{{message}}'}">
+  <button type="button" tabindex="0" class="icon-tooltip" v-tooltip.top="{content: '{{message}}', container: false}">
     {{ Icon('help') }}<span>{{ title }}</span>
-  </span>
+  </button>
 
 {%- endmacro %}