diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 70475768de0a7..5f33f35fc19dc 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -737,6 +737,7 @@
 		"--tab-sizing-fixed-min-width",
 		"--tab-sizing-fixed-max-width",
 		"--editor-group-tab-height",
+		"--editor-group-tabs-height",
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",
@@ -783,4 +784,4 @@
 		"--z-index-notebook-sticky-scroll",
 		"--zoom-factor"
 	]
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 32b7296069f42..b898596878fef 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -1930,6 +1930,8 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			available: new Dimension(width, height - this.editorPane.minimumHeight)
 		});
 
+		this.element.style.setProperty('--editor-group-tabs-height', `${this.titleHeight.offset}px`);
+
 		// Pass the container width and remaining height to the editor layout
 		const editorHeight = Math.max(0, height - titleControlSize.height);
 		this.editorContainer.style.height = `${editorHeight}px`;
diff --git a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
index 676c6e0fff887..f61bb8aaa450a 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
@@ -185,3 +185,8 @@
 	width: 100%;
 	height: 100%;
 }
+
+/* Override top position of progress bar which defined in vs/workbench/browser/media/part.css */
+.monaco-workbench .part.editor > .content .monaco-progress-container {
+	top: min(calc(var(--editor-group-tabs-height) - 2px), 0);
+}