diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index e6291132d5698..d8b28e0dd2481 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -128,8 +128,10 @@
 		"--vscode-dropdown-listBackground",
 		"--vscode-editor-background",
 		"--vscode-editor-findMatchBackground",
+		"--vscode-editor-findMatchForeground",
 		"--vscode-editor-findMatchBorder",
 		"--vscode-editor-findMatchHighlightBackground",
+		"--vscode-editor-findMatchHighlightForeground",
 		"--vscode-editor-findMatchHighlightBorder",
 		"--vscode-editor-findRangeHighlightBackground",
 		"--vscode-editor-findRangeHighlightBorder",
diff --git a/src/vs/editor/contrib/find/browser/findDecorations.ts b/src/vs/editor/contrib/find/browser/findDecorations.ts
index 62bfb58fb9ced..e5e9018464a56 100644
--- a/src/vs/editor/contrib/find/browser/findDecorations.ts
+++ b/src/vs/editor/contrib/find/browser/findDecorations.ts
@@ -288,6 +288,7 @@ export class FindDecorations implements IDisposable {
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		zIndex: 13,
 		className: 'currentFindMatch',
+		inlineClassName: 'currentFindMatchInline',
 		showIfCollapsed: true,
 		overviewRuler: {
 			color: themeColorFromId(overviewRulerFindMatchForeground),
@@ -304,6 +305,7 @@ export class FindDecorations implements IDisposable {
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		zIndex: 10,
 		className: 'findMatch',
+		inlineClassName: 'findMatchInline',
 		showIfCollapsed: true,
 		overviewRuler: {
 			color: themeColorFromId(overviewRulerFindMatchForeground),
diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css
index 5d3ef3277d799..d8c479cf1b77b 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.css
+++ b/src/vs/editor/contrib/find/browser/findWidget.css
@@ -232,6 +232,10 @@
 	background-color: var(--vscode-editor-findMatchHighlightBackground);
 }
 
+.monaco-editor .findMatchInline {
+	color: var(--vscode-editor-findMatchHighlightForeground);
+}
+
 .monaco-editor .currentFindMatch {
 	background-color: var(--vscode-editor-findMatchBackground);
 	border: 2px solid var(--vscode-editor-findMatchBorder);
@@ -239,6 +243,10 @@
 	box-sizing: border-box;
 }
 
+.monaco-editor .currentFindMatchInline {
+	color: var(--vscode-editor-findMatchForeground);
+}
+
 .monaco-editor .findScope {
 	background-color: var(--vscode-editor-findRangeHighlightBackground);
 }
diff --git a/src/vs/platform/theme/common/colors/editorColors.ts b/src/vs/platform/theme/common/colors/editorColors.ts
index 4116f5ec1410e..a57b85e2c29ca 100644
--- a/src/vs/platform/theme/common/colors/editorColors.ts
+++ b/src/vs/platform/theme/common/colors/editorColors.ts
@@ -141,10 +141,18 @@ export const editorFindMatch = registerColor('editor.findMatchBackground',
 	{ light: '#A8AC94', dark: '#515C6A', hcDark: null, hcLight: null },
 	nls.localize('editorFindMatch', "Color of the current search match."));
 
+export const editorFindMatchForeground = registerColor('editor.findMatchForeground',
+	{ light: null, dark: null, hcDark: null, hcLight: null },
+	nls.localize('editorFindMatchForeground', "Text color of the current search match."));
+
 export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground',
 	{ light: '#EA5C0055', dark: '#EA5C0055', hcDark: null, hcLight: null },
 	nls.localize('findMatchHighlight', "Color of the other search matches. The color must not be opaque so as not to hide underlying decorations."), true);
 
+export const editorFindMatchHighlightForeground = registerColor('editor.findMatchHighlightForeground',
+	{ light: null, dark: null, hcDark: null, hcLight: null },
+	nls.localize('findMatchHighlightForeground', "Foreground color of the other search matches."), true);
+
 export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground',
 	{ dark: '#3a3d4166', light: '#b4b4b44d', hcDark: null, hcLight: null },
 	nls.localize('findRangeHighlight', "Color of the range limiting the search. The color must not be opaque so as not to hide underlying decorations."), true);