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 a4364e4d2f..e63f9ff0b8 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
@@ -110,15 +110,9 @@ public abstract class AbstractNextPreviousAction extends CodeViewerContextAction
 
 	void setDirection(boolean isForward) {
 		this.isForward = isForward;
-		getMenuBarData().setMenuItemName(getMenuName());
 		setDescription(getDescription());
 	}
 
-	private String getMenuName() {
-		String prefix = isForward ? "Next " : "Previous ";
-		return prefix + getNavigationTypeName();
-	}
-
 	private String getDescriptionString() {
 		String prefix = isForward ? "Go To Next " : "Go To Previous ";
 		return prefix + getNavigationTypeName();
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPlugin.java
index b267fce6cd..3958ab885b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPlugin.java
@@ -141,7 +141,6 @@ public class NextPrevCodeUnitPlugin extends Plugin {
 		@Override
 		public void actionPerformed(NavigatableActionContext context) {
 			isForward = !isForward;
-			getMenuBarData().setIcon(isForward ? forwardIcon : backwardIcon);
 			getToolBarData().setIcon(isForward ? forwardIcon : backwardIcon);
 			updateActions(isForward);
 		}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPreviousBookmarkAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPreviousBookmarkAction.java
index 78a5e534f1..bb0aad8be6 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPreviousBookmarkAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPreviousBookmarkAction.java
@@ -227,15 +227,9 @@ public class NextPreviousBookmarkAction extends MultiStateDockingAction<String>
 
 	public void setDirection(boolean isForward) {
 		this.isForward = isForward;
-		getMenuBarData().setMenuItemName(getMenuName());
 		setDescription(getDescription());
 	}
 
-	private String getMenuName() {
-		String prefix = isForward ? "Next " : "Previous ";
-		return prefix + getNavigationTypeName();
-	}
-
 	private String getNavigationTypeName() {
 		return "Bookmark";
 	}
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
index 54c589589b..8e1f92d549 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
@@ -98,8 +98,11 @@ public abstract class AbstractDecompilerAction extends DockingAction {
 		HighSymbol highSymbol = null;
 		if (variable == null) {
 			// Token may be from a variable reference, in which case we have to dig to find the actual symbol
-			Address storageAddress =
-				getStorageAddress(token, highFunction.getFunction().getProgram());
+			Function function = highFunction.getFunction();
+			if (function == null) {
+				return null;
+			}
+			Address storageAddress = getStorageAddress(token, function.getProgram());
 			if (storageAddress == null) {
 				return null;
 			}