diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index ae3bd6cb18b..fd41b0c29fe 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -130,7 +130,8 @@ export class ExtensionHostMain {
 			// `workspaceGlob` or something along those lines?
 			if (p.indexOf('*') > -1 || p.indexOf('?') > -1) {
 				if (!this._diskSearch) {
-					this._diskSearch = new DiskSearch(false);
+					// Shut down this search process after 1s
+					this._diskSearch = new DiskSearch(false, 1000);
 				}
 
 				const query: ISearchQuery = {
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index b1317d6b7cc..1c2d62c29d1 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -200,12 +200,12 @@ export class DiskSearch {
 
 	private raw: IRawSearchService;
 
-	constructor(verboseLogging: boolean) {
+	constructor(verboseLogging: boolean, timeout: number = 60 * 60 * 1000) {
 		const client = new Client(
 			uri.parse(require.toUrl('bootstrap')).fsPath,
 			{
 				serverName: 'Search',
-				timeout: 60 * 60 * 1000,
+				timeout: timeout,
 				args: ['--type=searchService'],
 				env: {
 					AMD_ENTRYPOINT: 'vs/workbench/services/search/node/searchApp',