diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 0097b64d8e30fdff1242d24ffc9783f971b10ef3..4a1e04aff87d083b7f3fec8f4e0d55a9a138cde7 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1421,6 +1421,10 @@ export class CommandCenter {
 			opts.all = 'tracked';
 		}
 
+		if (opts.all && config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked') !== 'withchanges') {
+			opts.all = 'tracked';
+		}
+
 		await repository.commit(message, opts);
 
 		const postCommitCommand = config.get<'none' | 'push' | 'sync'>('postCommitCommand');