diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
index 83838f3d01..08a379875b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
@@ -78,7 +78,7 @@ public class ConfigPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("Configuration")
 			.icon(icon)
-			.panel(() -> configPanel)
+			.panel(configPanel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
index 84a406b3c6..d7e071c48b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
@@ -92,7 +92,7 @@ public class DevToolsPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("Developer Tools")
 			.icon(icon)
-			.panel(() -> panel)
+			.panel(panel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
index 3bd072e431..7f011e4fca 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
@@ -93,7 +93,7 @@ public class FeedPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("News Feed")
 			.icon(icon)
-			.panel(() -> feedPanel)
+			.panel(feedPanel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
index b2a1ddcfe0..e78e4f50ca 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
@@ -94,7 +94,7 @@ public class GrandExchangePlugin extends Plugin
 		button = NavigationButton.builder()
 			.name("GE Offers")
 			.icon(icon)
-			.panel(() -> panel)
+			.panel(panel)
 			.build();
 
 		pluginToolbar.addNavigation(button);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
index ac43c3a2d3..c30c4c1669 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
@@ -84,7 +84,7 @@ public class HiscorePlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("Hiscore")
 			.icon(icon)
-			.panel(() -> hiscorePanel)
+			.panel(hiscorePanel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
index 43abd0ddc0..bb14b4ea3e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
@@ -58,7 +58,7 @@ public class InfoPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("Info")
 			.icon(icon)
-			.panel(() -> panel)
+			.panel(panel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
index 5ed9759b58..50213e05e2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
@@ -89,7 +89,7 @@ public class KourendLibraryPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("Kourend Library")
 			.icon(icon)
-			.panel(() -> panel)
+			.panel(panel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
index c5f7984e3a..0cd89cfa66 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
@@ -74,7 +74,7 @@ public class NotesPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("Notes")
 			.icon(icon)
-			.panel(() -> panel)
+			.panel(panel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
index 34bfcee6db..6820c2e55d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
@@ -115,7 +115,7 @@ public class XpTrackerPlugin extends Plugin
 		navButton = NavigationButton.builder()
 			.name("XP Tracker")
 			.icon(icon)
-			.panel(() -> xpPanel)
+			.panel(xpPanel)
 			.build();
 
 		pluginToolbar.addNavigation(navButton);
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
index 6053663f59..cbd14b89b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
@@ -39,7 +39,6 @@ import java.awt.Toolkit;
 import java.awt.TrayIcon;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
@@ -210,9 +209,9 @@ public class ClientUI
 		button.setIcon(new ImageIcon(event.getButton().getIcon()));
 		button.addActionListener(e ->
 		{
-			final Supplier<PluginPanel> panelSupplier = event.getButton().getPanel();
+			final PluginPanel panel = event.getButton().getPanel();
 
-			if (panelSupplier == null)
+			if (panel == null)
 			{
 				return;
 			}
@@ -231,7 +230,7 @@ public class ClientUI
 			{
 				currentButton = button;
 				currentButton.setSelected(true);
-				expand(panelSupplier.get());
+				expand(panel);
 			}
 
 			if (event.getButton().getOnClick() != null)
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java
index 608f365455..18205a89ca 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java
@@ -27,7 +27,6 @@ package net.runelite.client.ui;
 
 import java.awt.image.BufferedImage;
 import java.util.Map;
-import java.util.function.Supplier;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,9 +70,9 @@ public class NavigationButton
 	private Runnable onClick;
 
 	/**
-	 * Supplier for plugin panel, used when expanding and contracting sidebar.
+	 * Plugin panel, used when expanding and contracting sidebar.
 	 */
-	private Supplier<PluginPanel> panel;
+	private PluginPanel panel;
 
 	/**
 	 * Map of key-value pairs for setting the popup menu