diff --git a/package.json b/package.json
index 86048d17ff75..06c1a125b00d 100644
--- a/package.json
+++ b/package.json
@@ -1080,73 +1080,73 @@
                     "command": "python.datascience.insertCellBelowPosition",
                     "title": "%python.command.python.datascience.insertCellBelowPosition.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.insertCellBelow",
                     "title": "%python.command.python.datascience.insertCellBelow.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.insertCellAbove",
                     "title": "%python.command.python.datascience.insertCellAbove.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.deleteCells",
                     "title": "%python.command.python.datascience.deleteCells.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.selectCell",
                     "title": "%python.command.python.datascience.selectCell.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.selectCellContents",
                     "title": "%python.command.python.datascience.selectCellContents.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.extendSelectionByCellAbove",
                     "title": "%python.command.python.datascience.extendSelectionByCellAbove.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.extendSelectionByCellBelow",
                     "title": "%python.command.python.datascience.extendSelectionByCellBelow.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.moveCellsUp",
                     "title": "%python.command.python.datascience.moveCellsUp.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.moveCellsDown",
                     "title": "%python.command.python.datascience.moveCellsDown.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.changeCellToMarkdown",
                     "title": "%python.command.python.datascience.changeCellToMarkdown.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.changeCellToCode",
                     "title": "%python.command.python.datascience.changeCellToCode.title%",
                     "category": "Python",
-                    "when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
                 },
                 {
                     "command": "python.datascience.runcurrentcell",
@@ -3685,4 +3685,4 @@
         "publisherDisplayName": "Microsoft",
         "publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8"
     }
-}
+}
\ No newline at end of file
diff --git a/package.nls.json b/package.nls.json
index 22b06bdda4bb..81fa8210f937 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -446,7 +446,7 @@
     "downloading.file.progress": "{0}{1} of {2} KB ({3}%)",
     "DataScience.jupyterDataRateExceeded": "Cannot view variable because data rate exceeded. Please restart your server with a higher data rate limit. For example, --NotebookApp.iopub_data_rate_limit=10000000000.0",
     "DataScience.addCellBelowCommandTitle": "Add cell",
-    "DataScience.debugCellCommandTitle": "Debug cell",
+    "DataScience.debugCellCommandTitle": "Debug Cell",
     "DataScience.debugStepOverCommandTitle": "Step over",
     "DataScience.debugContinueCommandTitle": "Continue",
     "DataScience.debugStopCommandTitle": "Stop",
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
index 2c66b1c48241..43989b875772 100644
--- a/src/client/common/utils/localize.ts
+++ b/src/client/common/utils/localize.ts
@@ -787,7 +787,7 @@ export namespace DataScience {
         'Cannot view variable because data rate exceeded. Please restart your server with a higher data rate limit. For example, --NotebookApp.iopub_data_rate_limit=10000000000.0'
     );
     export const addCellBelowCommandTitle = localize('DataScience.addCellBelowCommandTitle', 'Add cell');
-    export const debugCellCommandTitle = localize('DataScience.debugCellCommandTitle', 'Debug cell');
+    export const debugCellCommandTitle = localize('DataScience.debugCellCommandTitle', 'Debug Cell');
     export const debugStepOverCommandTitle = localize('DataScience.debugStepOverCommandTitle', 'Step over');
     export const debugContinueCommandTitle = localize('DataScience.debugContinueCommandTitle', 'Continue');
     export const debugStopCommandTitle = localize('DataScience.debugStopCommandTitle', 'Stop');