diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index f610a1aea083dfef5b51766901c6b01a0ea73cbe..ded33e8b1516005a9fc4a03d4eeceb23f29b28fc 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -128,6 +128,11 @@ table {
   border-spacing: 0;
 }
 
+.tooltip {
+  // Fix bootstrap4 bug whereby tooltips flicker when they are hovered over their borders
+  pointer-events: none;
+}
+
 .popover {
   font-size: 14px;
 }
diff --git a/changelogs/unreleased/fix-tooltip-flicker.yml b/changelogs/unreleased/fix-tooltip-flicker.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c94723d83dfb2614b29f35a4bb581233fe9fd391
--- /dev/null
+++ b/changelogs/unreleased/fix-tooltip-flicker.yml
@@ -0,0 +1,5 @@
+---
+title: Fix tooltip flickering bug
+merge_request:
+author:
+type: fixed