diff --git a/extensions/git/package.json b/extensions/git/package.json
index 00267c035a4..1cfa639292e 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1249,17 +1249,17 @@
         },
         {
           "command": "git.revealFileInOS.linux",
-          "when": "scmProvider == git && scmResourceGroup == merge && isLinux",
+          "when": "scmProvider == git && scmResourceGroup == merge && resourceScheme == file && isLinux",
           "group": "2_view@2"
         },
         {
           "command": "git.revealFileInOS.mac",
-          "when": "scmProvider == git && scmResourceGroup == merge && isMac",
+          "when": "scmProvider == git && scmResourceGroup == merge && resourceScheme == file && isMac",
           "group": "2_view@2"
         },
         {
           "command": "git.revealFileInOS.windows",
-          "when": "scmProvider == git && scmResourceGroup == merge && isWindows",
+          "when": "scmProvider == git && scmResourceGroup == merge && resourceScheme == file && isWindows",
           "group": "2_view@2"
         },
         {
@@ -1304,17 +1304,17 @@
         },
         {
           "command": "git.revealFileInOS.linux",
-          "when": "scmProvider == git && scmResourceGroup == index && isLinux",
+          "when": "scmProvider == git && scmResourceGroup == index && resourceScheme == file && isLinux",
           "group": "2_view@2"
         },
         {
           "command": "git.revealFileInOS.mac",
-          "when": "scmProvider == git && scmResourceGroup == index && isMac",
+          "when": "scmProvider == git && scmResourceGroup == index && resourceScheme == file && isMac",
           "group": "2_view@2"
         },
         {
           "command": "git.revealFileInOS.windows",
-          "when": "scmProvider == git && scmResourceGroup == index && isWindows",
+          "when": "scmProvider == git && scmResourceGroup == index && resourceScheme == file && isWindows",
           "group": "2_view@2"
         },
         {
@@ -1384,17 +1384,17 @@
         },
         {
           "command": "git.revealFileInOS.linux",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && isLinux",
+          "when": "scmProvider == git && scmResourceGroup == workingTree && resourceScheme == file && isLinux",
           "group": "2_view@2"
         },
         {
           "command": "git.revealFileInOS.mac",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && isMac",
+          "when": "scmProvider == git && scmResourceGroup == workingTree && resourceScheme == file && isMac",
           "group": "2_view@2"
         },
         {
           "command": "git.revealFileInOS.windows",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && isWindows",
+          "when": "scmProvider == git && scmResourceGroup == workingTree && resourceScheme == file && isWindows",
           "group": "2_view@2"
         },
         {