diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java
index 597ee11edfe..0020fd8c6ca 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java
@@ -160,7 +160,7 @@ public class AddressBarContributionItem extends ContributionItem {
 	 *            true to enable, else false.
 	 */
 	public void enableAddressBox(boolean enable) {
-		if (addressBox != null) {
+		if (addressBox != null && !item.isDisposed()) {
 			item.setEnabled(enable);
 			addressBox.setEnabled(enable);
 		}