diff --git a/.vscode/settings.json b/.vscode/settings.json
index e67870c6317..080fd78fa7b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -37,6 +37,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode",
     },
     "git.branchProtection": ["main", "release*"],
+    "git.branchProtectionPrompt": "alwaysCommitToNewBranch",
     "typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
     "python.linting.enabled": false,
     "python.testing.promptToConfigure": false,
diff --git a/src/notebooks/debugger/debuggingManager.ts b/src/notebooks/debugger/debuggingManager.ts
index ba8def1dee6..2b25cdeea7d 100644
--- a/src/notebooks/debugger/debuggingManager.ts
+++ b/src/notebooks/debugger/debuggingManager.ts
@@ -64,7 +64,7 @@ export class DebuggingManager
         @inject(ICommandManager) commandManager: ICommandManager,
         @inject(IApplicationShell) appShell: IApplicationShell,
         @inject(IVSCodeNotebook) vscNotebook: IVSCodeNotebook,
-        @inject(IConfigurationService) private readonly settings: IConfigurationService,
+        @inject(IConfigurationService) private readonly configurationService: IConfigurationService,
         @inject(IPlatformService) private readonly platform: IPlatformService,
         @inject(IDebugService) private readonly debugService: IDebugService,
         @inject(IServiceContainer) serviceContainer: IServiceContainer
@@ -268,11 +268,12 @@ export class DebuggingManager
         mode: KernelDebugMode.Cell | KernelDebugMode.RunByLine,
         cell: NotebookCell
     ) {
+        const settings = this.configurationService.getSettings(doc.uri);
         const config: IKernelDebugAdapterConfig = {
             type: pythonKernelDebugAdapter,
             name: path.basename(doc.uri.toString()),
             request: 'attach',
-            justMyCode: true,
+            justMyCode: settings.debugJustMyCode,
             // add a property to the config to know if the session is runByLine
             __mode: mode,
             __cellIndex: cell.index
@@ -339,7 +340,7 @@ export class DebuggingManager
                             cell,
                             this.commandManager,
                             kernel!,
-                            this.settings
+                            this.configurationService
                         );
                         adapter.setDebuggingDelegate(controller);
                         this.notebookToRunByLineController.set(debug.document, controller);