diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index 253b0b154ae73333e22c46e4e8a6c78487118309..138d2c9fb642d5208e021a6d04148eca29bf1fb6 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -84,11 +84,22 @@
 	outline-offset: -1px;
 }
 
+.monaco-shell.vs .monaco-button:focus,
 .monaco-shell.vs-dark .monaco-button:focus,
+.monaco-shell.vs .action-button:focus,
 .monaco-shell.vs-dark .action-button:focus {
 	outline-color: rgba(255, 255, 255, .5); /* buttons have a blue color, so focus indication needs to be different */
 }
 
+.monaco-shell.vs .monaco-button:focus,
+.monaco-shell.vs .action-button:focus {
+	outline-offset: -2px; /* Inset outline so it stands out on light background. */
+}
+
+.monaco-shell.hc-black .action-button:focus {
+	outline-offset: -4px; /* Helps high-contrast outline avoid clipping. */
+}
+
 .monaco-shell.hc-black .synthetic-focus input {
 	background:transparent; /* Search input focus fix when in high contrast */
 }