diff --git a/src/vs/workbench/parts/webview/electron-browser/webview-pre.js b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
index 9d1ce8f49fc..51a9d42aa32 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
+++ b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
@@ -190,8 +190,10 @@
 								postMessage: function(msg) {
 									return originalPostMessage({ command: 'onmessage', data: msg }, '*');
 								},
-								setState: function(state) {
-									return originalPostMessage({ command: 'do-update-state', data: JSON.stringify(state) }, '*');
+								setState: function(newState) {
+									state = newState;
+									originalPostMessage({ command: 'do-update-state', data: JSON.stringify(newState) }, '*');
+									return newState;
 								},
 								getState: function() {
 									return state;