diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/AbstractNextPreviousAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/AbstractNextPreviousAction.java
index a897d67b7e..a5c2e8e94f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/AbstractNextPreviousAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/AbstractNextPreviousAction.java
@@ -74,7 +74,7 @@ public abstract class AbstractNextPreviousAction extends NavigatableContextActio
 
 		try {
 			boolean direction = isForward;
-			if ((context.getEventModifiers() & ActionEvent.SHIFT_MASK) != 0) {
+			if ((context.getEventClickModifiers() & ActionEvent.SHIFT_MASK) != 0) {
 				direction = !direction;
 			}
 
@@ -123,7 +123,7 @@ public abstract class AbstractNextPreviousAction extends NavigatableContextActio
 
 	private String getDescriptionString() {
 		String prefix = isForward ? "Go To Next " : "Go To Previous ";
-		return prefix + getNavigationTypeName() + " (shift inverts direction)";
+		return prefix + getNavigationTypeName() + " (shift-click inverts direction)";
 	}
 
 	abstract protected String getNavigationTypeName();
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java b/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java
index 857cfe17b8..bef6edff42 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java
@@ -78,7 +78,7 @@ public class ActionContext {
 	private MouseEvent mouseEvent;
 	private Object contextObject;
 	private Object sourceObject;
-	private int eventModifiers;
+	private int eventClickModifiers;
 	private ActionContext globalContext;
 
 	// Note: the setting of this object is delayed.  This allows clients to build-up the state
@@ -185,25 +185,25 @@ public class ActionContext {
 	}
 
 	/**
-	 * Sets the modifiers for this event.
+	 * Sets the modifiers for this event that were present when the item was clicked on.
 	 * 
 	 * @param modifiers bit-masked int, see {@link ActionEvent#getModifiers()} or
 	 * {@link MouseEvent#getModifiersEx()}
 	 */
-	public void setEventModifiers(int modifiers) {
-		this.eventModifiers = modifiers;
+	public void setEventClickModifiers(int modifiers) {
+		this.eventClickModifiers = modifiers;
 	}
 
 	/**
-	 * Returns the modifiers for this event.
+	 * Returns the click modifiers for this event.
 	 * <p>
 	 * Only present for some mouse assisted events, e.g. clicking on a toolbar button or choosing
 	 * a menu item in a popup menu. 
 	 * 
 	 * @return bit-masked int, see {@link InputEvent#SHIFT_MASK}, etc
 	 */
-	public int getEventModifiers() {
-		return eventModifiers;
+	public int getEventClickModifiers() {
+		return eventClickModifiers;
 	}
 
 	/**
@@ -229,7 +229,7 @@ public class ActionContext {
 	 */
 	public ActionContext setMouseEvent(MouseEvent e) {
 		this.mouseEvent = e;
-		this.eventModifiers = e.getModifiersEx();
+		this.eventClickModifiers = e.getModifiersEx();
 		return this;
 	}
 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/PopupMenuHandler.java b/Ghidra/Framework/Docking/src/main/java/docking/PopupMenuHandler.java
index 4bac6265ef..f3606ccdb1 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/PopupMenuHandler.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/PopupMenuHandler.java
@@ -48,7 +48,7 @@ public class PopupMenuHandler extends MenuHandler {
         
 		DockingWindowManager.clearMouseOverHelp();
 		actionContext.setSourceObject(event.getSource());
-		actionContext.setEventModifiers(event.getModifiers());
+		actionContext.setEventClickModifiers(event.getModifiers());
 		
 		// this gives the UI some time to repaint before executing the action
         SwingUtilities.invokeLater( new Runnable() {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java
index 464a717cb1..e9e59ff48c 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java
@@ -116,7 +116,7 @@ public class ToolBarItemManager implements PropertyChangeListener, ActionListene
 		ActionContext context = getActionContext();
 
 		context.setSourceObject(event.getSource());
-		context.setEventModifiers(event.getModifiers());
+		context.setEventClickModifiers(event.getModifiers());
 
 		// this gives the UI some time to repaint before executing the action
 		SwingUtilities.invokeLater(() -> {