diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
index f71579cc5a3..bdbc3f4d6f9 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
@@ -347,7 +347,7 @@
       		commandId="org.eclipse.cdt.debug.ui.command.loadAllSymbols">
 			 <activeWhen>
 			    <with variable="selection">
-			        <iterate operator="or">
+			        <iterate operator="and">
 			            <instanceof value="org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.ModulesVMNode$ModuleVMContext">
 			            </instanceof>
 			        </iterate>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfLoadSymbolsCommandHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfLoadSymbolsCommandHandler.java
index fb71b41b39b..0aacba40da7 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfLoadSymbolsCommandHandler.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfLoadSymbolsCommandHandler.java
@@ -61,7 +61,7 @@ public class DsfLoadSymbolsCommandHandler extends AbstractHandler {
 			@Override
 			public void run() {
 				if (all) {
-					queueLoadAllSymbols(dsfSession, selection);
+					queueLoadAllSymbols(dsfSession);
 				} else {
 					// load symbols of specific element
 					for (Object o : selection.toList()) {
@@ -72,7 +72,7 @@ public class DsfLoadSymbolsCommandHandler extends AbstractHandler {
 		});
 	}
 
-	@ConfinedToDsfExecutor("fSession.getExecutor()")
+	@ConfinedToDsfExecutor("session.getExecutor()")
 	private void queueLoadSymbols(final DsfSession session, final Object module) {
 		if (!(module instanceof IDMVMContext))
 			return;
@@ -96,8 +96,8 @@ public class DsfLoadSymbolsCommandHandler extends AbstractHandler {
 		}
 	}
 
-	@ConfinedToDsfExecutor("fSession.getExecutor()")
-	private void queueLoadAllSymbols(final DsfSession session, IStructuredSelection selection) {
+	@ConfinedToDsfExecutor("session.getExecutor()")
+	private void queueLoadAllSymbols(final DsfSession session) {
 		IAdaptable debugContext = DebugUITools.getDebugContext();
 		IDMContext dmcontext = (IDMContext) debugContext.getAdapter(IDMContext.class);
 		ISymbolDMContext symDmc = DMContexts.getAncestorOfType(dmcontext, ISymbolDMContext.class);