diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
index 7355d928fba..93675538420 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
@@ -435,7 +435,6 @@ suite('vscode API - window', () => {
 		tabs = window.tabs;
 		// Tabs should now be B -> C -> A
 		assert.strictEqual(tabs[1].resource?.toString(), docC.uri.toString());
-
 		await tabs[2].move(1000, ViewColumn.Two);
 		assert.strictEqual(tabs.length, 3);
 		tabs = window.tabs;
diff --git a/src/vs/workbench/api/common/extHostEditorTabs.ts b/src/vs/workbench/api/common/extHostEditorTabs.ts
index 7e7b79c8b29..07cbcd20d78 100644
--- a/src/vs/workbench/api/common/extHostEditorTabs.ts
+++ b/src/vs/workbench/api/common/extHostEditorTabs.ts
@@ -11,6 +11,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ViewColumn } from 'vs/workbench/api/common/extHostTypes';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { raceTimeout } from 'vs/base/common/async';
 
 export interface IEditorTab {
 	label: string;
@@ -74,7 +75,7 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 				isActive: dto.isActive,
 				move: async (index: number, viewColumn: ViewColumn) => {
 					this._proxy.$moveTab(dto, index, typeConverters.ViewColumn.from(viewColumn));
-					await Event.toPromise(this._onDidChangeTabs.event);
+					await raceTimeout(Event.toPromise(this._onDidChangeTabs.event), 1000);
 					return;
 				},
 			});