diff --git a/src/public/javascripts/services/tooltip.js b/src/public/javascripts/services/tooltip.js
index c45d3729c..8f3ea5327 100644
--- a/src/public/javascripts/services/tooltip.js
+++ b/src/public/javascripts/services/tooltip.js
@@ -44,7 +44,7 @@ function setupTooltip() {
                 container: 'body',
                 placement: 'auto',
                 trigger: 'manual',
-                boundariesElement: 'window',
+                boundary: 'window',
                 title: html,
                 html: true
             });
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index f8dbf0888..13907c634 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -545,6 +545,11 @@ table.promoted-attributes-in-tooltip td, table.promoted-attributes-in-tooltip th
     overflow-y: auto;
 }
 
+/* this should help with tooltip flickering */
+.tooltip {
+    pointer-events: none;
+}
+
 .tooltip-inner {
     background-color: #fbfbfb !important;
     max-width: 400px;