1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/feature_highlight/feature_highlight.js b/app/assets/javascripts/feature_highlight/feature_highlight.js
index 0d385ab0aac..139d7826118 100644
--- a/app/assets/javascripts/feature_highlight/feature_highlight.js
+++ b/app/assets/javascripts/feature_highlight/feature_highlight.js
@@ -31,12 +31,9 @@ export function setupFeatureHighlightPopover(id, debounceTimeout = 300) {
     .on('mouseenter', mouseenter)
     .on('mouseleave', debouncedMouseleave(debounceTimeout))
     .on('inserted.bs.popover', inserted)
-    .on('show.bs.popover', () => {
+    .one('show.bs.popover', () => {
       window.addEventListener('scroll', hideOnScroll);
     })
-    .on('hide.bs.popover', () => {
-      window.removeEventListener('scroll', hideOnScroll);
-    })
     // Display feature highlight
     .removeAttr('disabled');
 }