diff --git a/src/vs/workbench/parts/html/browser/webview.html b/src/vs/workbench/parts/html/browser/webview.html
index f3865d0b41a..4bf4659054a 100644
--- a/src/vs/workbench/parts/html/browser/webview.html
+++ b/src/vs/workbench/parts/html/browser/webview.html
@@ -34,7 +34,7 @@
 
 		// propagate focus
 		ipcRenderer.on('focus', function() {
-			target.contentDocument.body.focus();
+			target.contentWindow.focus();
 		});
 
 		// update iframe-contents
diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index fa2d33cd25d..dc3b2b598e5 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -110,6 +110,7 @@ export default class Webview {
 	}
 
 	focus(): void {
+		this._webview.focus();
 		this._send('focus');
 	}