diff --git a/package.json b/package.json
index 8346502934..5566637d47 100644
--- a/package.json
+++ b/package.json
@@ -307,47 +307,47 @@
       "editor/title": [
         {
           "command": "mssql.runQuery",
-          "when": "editorLangId == sql",
+          "when": "editorLangId == sql && !isInDiffEditor",
           "group": "navigation@1"
         },
         {
           "command": "mssql.cancelQuery",
-          "when": "editorLangId == sql && resourcePath in mssql.runningQueries",
+          "when": "editorLangId == sql && !isInDiffEditor && resourcePath in mssql.runningQueries",
           "group": "navigation@2"
         },
         {
           "command": "mssql.revealQueryResultPanel",
-          "when": "editorLangId == sql && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature && view.queryResult.visible == false",
+          "when": "editorLangId == sql && !isInDiffEditor && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature && view.queryResult.visible == false",
           "group": "navigation@2"
         },
         {
           "command": "mssql.connect",
-          "when": "editorLangId == sql && resource not in mssql.connections",
+          "when": "editorLangId == sql && !isInDiffEditor && resource not in mssql.connections",
           "group": "navigation@3"
         },
         {
           "command": "mssql.disconnect",
-          "when": "editorLangId == sql && resource in mssql.connections",
+          "when": "editorLangId == sql && !isInDiffEditor && resource in mssql.connections",
           "group": "navigation@3"
         },
         {
           "command": "mssql.changeDatabase",
-          "when": "editorLangId == sql",
+          "when": "editorLangId == sql && !isInDiffEditor",
           "group": "navigation@4"
         },
         {
           "command": "mssql.showExecutionPlanInResults",
-          "when": "editorLangId == sql && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature",
+          "when": "editorLangId == sql && !isInDiffEditor && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature",
           "group": "navigation@4"
         },
         {
           "command": "mssql.enableActualPlan",
-          "when": "editorLangId == sql && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature && !(resource in mssql.executionPlan.urisWithActualPlanEnabled)",
+          "when": "editorLangId == sql && !isInDiffEditor && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature && !(resource in mssql.executionPlan.urisWithActualPlanEnabled)",
           "group": "navigation@5"
         },
         {
           "command": "mssql.disableActualPlan",
-          "when": "editorLangId == sql && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature && resource in mssql.executionPlan.urisWithActualPlanEnabled",
+          "when": "editorLangId == sql && !isInDiffEditor && config.mssql.enableRichExperiences && config.mssql.enableNewQueryResultFeature && resource in mssql.executionPlan.urisWithActualPlanEnabled",
           "group": "navigation@5"
         }
       ],