diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerActionContext.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerActionContext.java
index f6feeabc06..29e5da39a1 100644
--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerActionContext.java
+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerActionContext.java
@@ -1,13 +1,12 @@
 /* ###
  * IP: GHIDRA
- * REVIEWED: YES
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,12 +15,24 @@
  */
 package ghidra.app.plugin.core.byteviewer;
 
+import java.util.Set;
+
 import ghidra.app.context.NavigatableActionContext;
+import ghidra.program.model.listing.Function;
 
 public class ByteViewerActionContext extends NavigatableActionContext {
-	
+
 	public ByteViewerActionContext(ProgramByteViewerComponentProvider provider) {
 		super(provider, provider);
 	}
 
+	@Override
+	public boolean hasFunctions() {
+		return false; // the Byte Viewer doesn't work on functions
+	}
+
+	@Override
+	public Set<Function> getFunctions() {
+		return Set.of(); // the Byte Viewer doesn't work on functions
+	}
 }