diff --git a/src/root/common.tt b/src/root/common.tt
index 758bfa59..dd3a3367 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -526,9 +526,9 @@ BLOCK makeLazyTab %]
 
 
 BLOCK makePopover %]
-  <div class="btn hydra-popover [% classes %]" data-toggle="popover" data-html="true" [% HTML.attributes('data-content' => content, 'data-placement' => placement || 'bottom') %]>
+  <button type="button" class="btn hydra-popover [% classes %]" data-toggle="popover" data-html="true" [% HTML.attributes('data-content' => content, 'data-placement' => placement || 'bottom') %]>
     [% title %]
-  </div>
+  </button>
 [% END;
 
 
diff --git a/src/root/static/js/common.js b/src/root/static/js/common.js
index 4988402e..31788834 100644
--- a/src/root/static/js/common.js
+++ b/src/root/static/js/common.js
@@ -48,6 +48,14 @@ $(document).ready(function() {
 
     bootbox.setDefaults({ animate: false });
 
+    /* Enable popovers (and allow table and teletype elements in them). */
+    $.fn.popover.Constructor.Default.whiteList.table = [];
+    $.fn.popover.Constructor.Default.whiteList.thead = []
+    $.fn.popover.Constructor.Default.whiteList.tbody = [];
+    $.fn.popover.Constructor.Default.whiteList.tr = [];
+    $.fn.popover.Constructor.Default.whiteList.th = [];
+    $.fn.popover.Constructor.Default.whiteList.td = [];
+    $.fn.popover.Constructor.Default.whiteList.tt = [];
     $(".hydra-popover").popover({});
 
     /* Activates tab according to URL anchor. */