diff --git a/src/vs/workbench/services/search/node/fileSearchManager.ts b/src/vs/workbench/services/search/node/fileSearchManager.ts
index d78ded834d1bb13b69b5266b0831a4fcec1c4389..2543bc9e0f4bac6980977c910a6f11e4f7ccb432 100644
--- a/src/vs/workbench/services/search/node/fileSearchManager.ts
+++ b/src/vs/workbench/services/search/node/fileSearchManager.ts
@@ -136,10 +136,10 @@ class FileSearchEngine {
 
 					if (results) {
 						results.forEach(result => {
-							const relativePath = path.relative(fq.folder.fsPath, result.fsPath);
+							const relativePath = path.posix.relative(fq.folder.path, result.path);
 
 							if (noSiblingsClauses) {
-								const basename = path.basename(result.fsPath);
+								const basename = path.basename(result.path);
 								this.matchFile(onResult, { base: fq.folder, relativePath, basename });
 
 								return;
diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
index 0f1f053faf232d398f6abdfa651223fc4fe534f0..7200e234facc656beb506bd37528f6cc34215d58 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
@@ -181,7 +181,7 @@ suite('ExtHostSearch', () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
-				joinPath(rootFolderA, 'file3.ts')
+				joinPath(rootFolderA, 'subfolder/file3.ts')
 			];
 
 			await registerTestFileSearchProvider({
@@ -586,7 +586,7 @@ suite('ExtHostSearch', () => {
 			const reportedResults = [
 				joinPath(fancySchemeFolderA, 'file1.ts'),
 				joinPath(fancySchemeFolderA, 'file2.ts'),
-				joinPath(fancySchemeFolderA, 'file3.ts'),
+				joinPath(fancySchemeFolderA, 'subfolder/file3.ts'),
 
 			];