diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index c2f6ad9010..902a0d9756 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -831,7 +831,9 @@ export default class Component {
 			});
 		});
 
-		return Array.from(deps).map(n => x`$$invalidate('${n}', ${n})`);
+		return Array.from(deps)
+			.map(n => x`$$invalidate('${n}', ${n})`)
+			.reduce((lhs, rhs) => x`${lhs}, ${rhs}}`);
 	}
 
 	rewrite_props(get_insert: (variable: Var) => Node[]) {
diff --git a/src/compiler/compile/render_dom/wrappers/Window.ts b/src/compiler/compile/render_dom/wrappers/Window.ts
index 7c4c351da4..ce63a431d4 100644
--- a/src/compiler/compile/render_dom/wrappers/Window.ts
+++ b/src/compiler/compile/render_dom/wrappers/Window.ts
@@ -127,7 +127,7 @@ export default class WindowWrapper extends Wrapper {
 
 			component.partly_hoisted.push(b`
 				function ${id}() {
-					${props.map(prop => x`$$invalidate('${prop.name}', ${prop.name} = @_window.${prop.value});`)}
+					${props.map(prop => b`$$invalidate('${prop.name}', ${prop.name} = @_window.${prop.value});`)}
 				}
 			`);