diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java b/Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java
index 93cd15a61f..82e8c35169 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java
@@ -173,6 +173,7 @@ class DockableToolBarManager {
 			Tool tool = dwm.getTool();
 			ComponentProvider provider = dockableComponent.getComponentProvider();
 			tool.removeLocalAction(provider, closeButtonManager.getAction());
+			tool.removeLocalAction(provider, menuButtonManager.getAction());
 		}
 
 		headerUpdater.dispose();
@@ -253,5 +254,14 @@ class DockableToolBarManager {
 			popupMenu.addPopupMenuListener(menuManager.getMenuHandler());
 			popupMenu.show(myButton, 0, d.height);
 		}
+
+		@Override
+		public boolean isEnabledForContext(ActionContext context) {
+			if (myButton == null) {
+				return false; // no menu items; no drop-down menu
+			}
+			ComponentProvider provider = context.getComponentProvider();
+			return provider == dockableComponent.getComponentProvider();
+		}
 	}
 }