diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
index ffbce9e515..2992c9acd5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
@@ -35,6 +35,9 @@ import java.awt.Rectangle;
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.Getter;
+import lombok.Setter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
@@ -66,7 +69,8 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 
-public class DevToolsOverlay extends Overlay
+@Singleton
+class DevToolsOverlay extends Overlay
 {
 	private static final int ITEM_EMPTY = 6512;
 	private static final int ITEM_FILLED = 20594;
@@ -88,6 +92,13 @@ public class DevToolsOverlay extends Overlay
 	private final DevToolsPlugin plugin;
 	private final TooltipManager toolTipManager;
 
+	@Setter
+	@Getter
+	private Widget widget;
+
+	@Setter
+	private int itemIndex = -1;
+
 	@Inject
 	private DevToolsOverlay(Client client, DevToolsPlugin plugin, TooltipManager toolTipManager)
 	{
@@ -435,9 +446,6 @@ public class DevToolsOverlay extends Overlay
 
 	public void renderWidgets(Graphics2D graphics)
 	{
-		Widget widget = plugin.currentWidget;
-		int itemIndex = plugin.itemIndex;
-
 		if (widget == null || widget.isHidden())
 		{
 			return;
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 289c2fe9c1..0994745b42 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
@@ -49,7 +49,6 @@ import net.runelite.api.events.ExperienceChanged;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.kit.KitType;
-import net.runelite.api.widgets.Widget;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -122,10 +121,6 @@ public class DevToolsPlugin extends Plugin
 	private DevToolsButton detachedCamera;
 	private DevToolsButton widgetInspector;
 	private DevToolsButton varInspector;
-
-	Widget currentWidget;
-	int itemIndex = -1;
-
 	private NavigationButton navButton;
 
 	@Provides
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
index 452fa00202..bf11a797cf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
@@ -61,8 +61,8 @@ class WidgetInspector extends JFrame
 {
 	private final Client client;
 	private final ClientThread clientThread;
-	private final DevToolsPlugin plugin;
 	private final DevToolsConfig config;
+	private final DevToolsOverlay overlay;
 
 	private final JTree widgetTree;
 	private final WidgetInfoTableModel infoTableModel;
@@ -71,13 +71,19 @@ class WidgetInspector extends JFrame
 	private static final Map<Integer, WidgetInfo> widgetIdMap = new HashMap<>();
 
 	@Inject
-	WidgetInspector(DevToolsPlugin plugin, Client client, ClientThread clientThread, WidgetInfoTableModel infoTableModel, DevToolsConfig config, EventBus eventBus)
+	private WidgetInspector(
+		Client client,
+		ClientThread clientThread,
+		WidgetInfoTableModel infoTableModel,
+		DevToolsConfig config,
+		EventBus eventBus,
+		DevToolsOverlay overlay)
 	{
-		this.plugin = plugin;
 		this.client = client;
 		this.clientThread = clientThread;
 		this.infoTableModel = infoTableModel;
 		this.config = config;
+		this.overlay = overlay;
 
 		eventBus.register(this);
 
@@ -90,8 +96,8 @@ class WidgetInspector extends JFrame
 			@Override
 			public void windowClosing(WindowEvent e)
 			{
-				plugin.currentWidget = null;
-				plugin.itemIndex = -1;
+				overlay.setWidget(null);
+				overlay.setItemIndex(-1);
 			}
 		});
 
@@ -107,16 +113,16 @@ class WidgetInspector extends JFrame
 			{
 				WidgetTreeNode node = (WidgetTreeNode) selected;
 				Widget widget = node.getWidget();
-				plugin.currentWidget = widget;
-				plugin.itemIndex = widget.getItemId();
+				overlay.setWidget(widget);
+				overlay.setItemIndex(widget.getItemId());
 				refreshInfo();
 				log.debug("Set widget to {} and item index to {}", widget, widget.getItemId());
 			}
 			else if (selected instanceof WidgetItemNode)
 			{
 				WidgetItemNode node = (WidgetItemNode) selected;
-				plugin.itemIndex = node.getWidgetItem().getIndex();
-				log.debug("Set item index to {}", plugin.itemIndex);
+				overlay.setItemIndex(node.getWidgetItem().getIndex());
+				log.debug("Set item index to {}", node.getWidgetItem().getIndex());
 			}
 		});
 
@@ -145,12 +151,12 @@ class WidgetInspector extends JFrame
 		final JButton revalidateWidget = new JButton("Revalidate");
 		revalidateWidget.addActionListener(ev -> clientThread.invokeLater(() ->
 		{
-			if (plugin.currentWidget == null)
+			if (overlay.getWidget() == null)
 			{
 				return;
 			}
 
-			plugin.currentWidget.revalidate();
+			overlay.getWidget().revalidate();
 		}));
 		bottomPanel.add(revalidateWidget);
 
@@ -175,8 +181,8 @@ class WidgetInspector extends JFrame
 			Widget[] rootWidgets = client.getWidgetRoots();
 			DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
-			plugin.currentWidget = null;
-			plugin.itemIndex = -1;
+			overlay.setWidget(null);
+			overlay.setItemIndex(-1);
 
 			for (Widget widget : rootWidgets)
 			{
@@ -189,8 +195,8 @@ class WidgetInspector extends JFrame
 
 			SwingUtilities.invokeLater(() ->
 			{
-				plugin.currentWidget = null;
-				plugin.itemIndex = -1;
+				overlay.setWidget(null);
+				overlay.setItemIndex(-1);
 				refreshInfo();
 				widgetTree.setModel(new DefaultTreeModel(root));
 			});
@@ -264,7 +270,7 @@ class WidgetInspector extends JFrame
 
 	private void refreshInfo()
 	{
-		infoTableModel.setWidget(plugin.currentWidget);
+		infoTableModel.setWidget(overlay.getWidget());
 	}
 
 	static WidgetInfo getWidgetInfo(int packedId)