diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerLegacyRegionsPanel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerLegacyRegionsPanel.java
index 91246709d8..b29c35a4e9 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerLegacyRegionsPanel.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerLegacyRegionsPanel.java
@@ -4,9 +4,9 @@
  * 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.
@@ -294,7 +294,6 @@ public class DebuggerLegacyRegionsPanel extends JPanel {
 		currentTrace = trace;
 		addNewListeners();
 		loadRegions();
-		contextChanged();
 	}
 
 	public void contextChanged() {
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerRegionsProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerRegionsProvider.java
index 503fc6a940..8e0a461de7 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerRegionsProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerRegionsProvider.java
@@ -4,9 +4,9 @@
  * 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.
@@ -537,12 +537,9 @@ public class DebuggerRegionsProvider extends ComponentProviderAdapter {
 	@Override
 	public void contextChanged() {
 		super.contextChanged();
-		if (current.getTrace() != null) {
-			actionForceFullView.setSelected(current.getTrace()
-					.getProgramView()
-					.getMemory()
-					.isForceFullView());
-		}
+		Trace trace = current.getTrace();
+		actionForceFullView.setSelected(trace == null ? false
+				: trace.getProgramView().getMemory().isForceFullView());
 	}
 
 	public Entry<Program, MemoryBlock> askBlock(TraceMemoryRegion region, Program program,
@@ -581,5 +578,7 @@ public class DebuggerRegionsProvider extends ComponentProviderAdapter {
 				mainPanel.validate();
 			}
 		}
+
+		contextChanged();
 	}
 }