diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypesProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypesProvider.java
index f267775258..206d3aa35f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypesProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypesProvider.java
@@ -340,6 +340,15 @@ public class DataTypesProvider extends ComponentProviderAdapter {
 			clickedNode = archiveGTree.getNodeForLocation(point.x, point.y);
 			isToolbarAction = false;
 		}
+		else {
+			// Called via a keybinding; use the selected node in the tree to represent the clicked
+			// node.  This allows users to use a keybinding to show the context menu and have all
+			// actions installed.
+			TreePath path = archiveGTree.getSelectionPath();
+			if (path != null) {
+				clickedNode = (GTreeNode) path.getLastPathComponent();
+			}
+		}
 
 		return new DataTypesActionContext(this, plugin.getProgram(), archiveGTree, clickedNode,
 			isToolbarAction);