diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.css b/src/vs/editor/contrib/accessibility/browser/accessibility.css
index 8a4d3f18582b4a45d9c168b1c5456bbef6376099..458b5b13ad098afb5b4282d05d6354ef14fdfd47 100644
--- a/src/vs/editor/contrib/accessibility/browser/accessibility.css
+++ b/src/vs/editor/contrib/accessibility/browser/accessibility.css
@@ -6,20 +6,4 @@
 .monaco-editor .accessibilityHelpWidget {
 	padding: 10px;
 	vertical-align: middle;
-}
-
-.monaco-editor .accessibilityHelpWidget {
-	background-color: #EFEFF2;
-	box-shadow: 0 2px 8px #A8A8A8;
-}
-
-.monaco-editor.vs-dark .accessibilityHelpWidget {
-	background-color: #2D2D30;
-	box-shadow: 0 2px 8px #000;
-}
-
-.monaco-editor.hc-black .accessibilityHelpWidget {
-	background-color: #000;
-	box-shadow: none;
-	outline: 2px solid #6FC3DF;
 }
\ No newline at end of file
diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.ts b/src/vs/editor/contrib/accessibility/browser/accessibility.ts
index f6b20e83beb2dd269a57fa34afff87da527a8dc7..62a246326e3573a03a6b5cc8c0d1e2e665839747 100644
--- a/src/vs/editor/contrib/accessibility/browser/accessibility.ts
+++ b/src/vs/editor/contrib/accessibility/browser/accessibility.ts
@@ -24,6 +24,8 @@ import { editorAction, CommonEditorRegistry, EditorAction, EditorCommand, Comman
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions';
 import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode';
+import { registerThemingParticipant } from "vs/platform/theme/common/themeService";
+import { editorWidgetBackground, editorWidgetShadow, highContrastBorder } from "vs/platform/theme/common/colorRegistry";
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 const TOGGLE_EXPERIMENTAL_SCREEN_READER_SUPPORT_COMMAND_ID = 'toggleExperimentalScreenReaderSupport';
@@ -251,3 +253,20 @@ class ToggleExperimentalScreenReaderSupportCommand extends Command {
 }
 
 CommonEditorRegistry.registerEditorCommand(new ToggleExperimentalScreenReaderSupportCommand());
+
+registerThemingParticipant((theme, collector) => {
+	let widgetBackground = theme.getColor(editorWidgetBackground);
+	if (widgetBackground) {
+		collector.addRule(`.monaco-editor.${theme.selector} .accessibilityHelpWidget { background-color: ${widgetBackground}; }`);
+	}
+
+	let widgetShadow = theme.getColor(editorWidgetShadow);
+	if (widgetShadow) {
+		collector.addRule(`.monaco-editor.${theme.selector} .accessibilityHelpWidget { box-shadow: 0 2px 8px ${widgetShadow}; }`);
+	}
+
+	let hcBorder = theme.getColor(highContrastBorder);
+	if (hcBorder) {
+		collector.addRule(`.monaco-editor.${theme.selector} .accessibilityHelpWidget { border: 2px solid ${hcBorder}; }`);
+	}
+});