patternfly-java
diff --git a/‎components/src/main/java/org/patternfly/component/ScrollButtons.java‎
Lines changed: 8 additions & 1 deletion b/‎components/src/main/java/org/patternfly/component/ScrollButtons.java‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎components/src/main/java/org/patternfly/component/navigation/Navigation.java‎
Lines changed: 1 addition & 1 deletion b/‎components/src/main/java/org/patternfly/component/navigation/Navigation.java‎
Lines changed: 1 addition & 1 deletion
@@ -20,7 +20,6 @@
 import org.patternfly.core.Aria;
 import org.patternfly.core.LanguageDirection;
 import org.patternfly.core.ObservableValue;
-
 import elemental2.dom.HTMLElement;
 import elemental2.dom.Node;
 import elemental2.dom.NodeList;
@@ -33,6 +32,7 @@
 import static org.jboss.elemento.Elements.setVisible;
 import static org.jboss.elemento.EventType.bind;
 import static org.jboss.elemento.EventType.resize;
+import static org.jboss.elemento.EventType.scroll;
 import static org.patternfly.component.button.Button.button;
 import static org.patternfly.core.Aria.hidden;
 import static org.patternfly.core.Aria.label;
@@ -64,6 +64,7 @@ public class ScrollButtons {
     private final ObservableValue<Boolean> disableForwardScrollButton;
 
     private double scrollTimeout;
+    private HandlerRegistration scrollHandler;
     private HandlerRegistration resizeHandler;
     private HandlerRegistration transitionEndHandler;
 
@@ -90,9 +91,12 @@ public ScrollButtons(HTMLElement component, HTMLElement itemsContainer, String c
                         .aria(hidden, true)
                         .aria(label, "Scroll forward"))
                 .element();
+        setVisible(scrollBackContainer, false);
+        setVisible(scrollForwardContainer, false);
     }
 
     public void attach() {
+        scrollHandler = bind(itemsContainer, scroll, e -> updateScrollState());
         scrollBack.onClick((e, b) -> scrollBack());
         scrollForward.onClick((e, b) -> scrollForward());
         enableScrollButtons.subscribe((current, previous) -> {
@@ -125,6 +129,9 @@ public void attach() {
 
     public void detach() {
         clearTimeout(scrollTimeout);
+        if (scrollHandler != null) {
+            scrollHandler.removeHandler();
+        }
         if (resizeHandler != null) {
             resizeHandler.removeHandler();
         }
 
@@ -53,6 +53,7 @@
 import static org.jboss.elemento.Elements.nav;
 import static org.jboss.elemento.Elements.removeChildrenFrom;
 import static org.jboss.elemento.Elements.ul;
+import static org.jboss.elemento.EventType.scroll;
 import static org.patternfly.component.divider.Divider.divider;
 import static org.patternfly.component.divider.DividerType.li;
 import static org.patternfly.component.navigation.NavigationType.Horizontal.primary;
@@ -138,7 +139,6 @@ public static Navigation navigation(NavigationType type) {
                     .attr(role, Roles.list)
                     .element();
             scrollButtons = new ScrollButtons(element(), itemsContainer, component(nav, Classes.scroll, button));
-            itemsContainer.addEventListener(EventType.scroll.name, e -> scrollButtons.updateScrollState());
             addAll(scrollButtons.scrollBackContainer, itemsContainer, scrollButtons.scrollForwardContainer);
 
         } else if (type instanceof NavigationType.Vertical) {