diff --git a/extensions/git/package.json b/extensions/git/package.json
index 404f79ad5ac..653b9729764 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -510,12 +510,12 @@
         {
           "command": "git.openFile",
           "group": "navigation",
-          "when": "isInDiffEditor"
+          "when": "isInDiffEditor && resourceScheme == file"
         },
         {
           "command": "git.openChange",
           "group": "navigation",
-          "when": "!isInDiffEditor"
+          "when": "!isInDiffEditor && resourceScheme == file"
         }
       ]
     },