diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6d146fe..cc4777f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Halstead metrics: show full function signatures.
 - DUB projects: added support for the _syntax_ build type. (#83)
+- GDB commander: arguments of the _Debugee Options_ can be temporarily deactivated by prepending `//`.
 
 # v3.9.11
 
diff --git a/src/u_gdb.pas b/src/u_gdb.pas
index 9a44cee1..f6b26997 100644
--- a/src/u_gdb.pas
+++ b/src/u_gdb.pas
@@ -2067,7 +2067,8 @@ begin
     else
       str += ' ';
     for i := 0 to o.arguments.Count-1 do
-      str += o.arguments[i] + ' ';
+      if not isStringDisabled(o.arguments[i]) then
+        str += o.arguments[i] + ' ';
     str := fSyms.expand(str);
   end;
   gdbCommand('-exec-arguments '+ str + '> ' + fOutputName + '< ' + fInputName);