diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
index 0eaac05395..b1d5779859 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
@@ -301,7 +301,16 @@ public class SwingUtil
 			button.setComponentPopupMenu(popupMenu);
 		}
 
-		navigationButton.setOnSelect(() -> button.setSelected(navigationButton.isSelected()));
+		navigationButton.setOnSelect(() ->
+		{
+			button.setSelected(navigationButton.isSelected());
+
+			if (navigationButton.isSelected())
+			{
+				button.doClick();
+			}
+		});
+
 		return button;
 	}