diff --git a/src/compile/Component.ts b/src/compile/Component.ts
index 24e2098901..52ac299ec0 100644
--- a/src/compile/Component.ts
+++ b/src/compile/Component.ts
@@ -543,30 +543,20 @@ export default class Component {
 				});
 			}
 
-			if (!/Import/.test(node.type)) {
-				const kind = node.type === 'VariableDeclaration'
-					? node.kind
-					: node.type === 'ClassDeclaration'
-						? 'class'
-						: node.type === 'FunctionDeclaration'
-							? 'function'
-							: null;
-
-				// sanity check
-				if (!kind) throw new Error(`Unknown declaration type ${node.type}`);
-
-				this.add_var({
-					name,
-					module: true,
-					hoistable: true,
-					writable: kind === 'var' || kind === 'let'
-				});
-			}
+			this.add_var({
+				name,
+				module: true,
+				hoistable: true,
+				writable: node.kind === 'var' || node.kind === 'let'
+			});
 		});
 
-		globals.forEach(name => {
+		globals.forEach((node, name) => {
 			if (name[0] === '$') {
-				// TODO should this be possible?
+				this.error(node, {
+					code: 'illegal-subscription',
+					message: `Cannot reference store value inside <script context="module">`
+				})
 			} else {
 				this.add_var({
 					name,
@@ -622,7 +612,7 @@ export default class Component {
 			this.node_for_declaration.set(name, node);
 		});
 
-		globals.forEach(name => {
+		globals.forEach((node, name) => {
 			if (this.var_lookup.has(name)) return;
 
 			if (this.injected_reactive_declaration_vars.has(name)) {
diff --git a/src/utils/annotateWithScopes.ts b/src/utils/annotateWithScopes.ts
index adf7619bed..3a90ed79a1 100644
--- a/src/utils/annotateWithScopes.ts
+++ b/src/utils/annotateWithScopes.ts
@@ -5,7 +5,7 @@ import { Node } from '../interfaces';
 export function createScopes(expression: Node) {
 	const map = new WeakMap();
 
-	const globals = new Set();
+	const globals: Map<string, Node> = new Map();
 	let scope = new Scope(null, false);
 
 	walk(expression, {
@@ -39,8 +39,8 @@ export function createScopes(expression: Node) {
 			} else if (/(Class|Variable)Declaration/.test(node.type)) {
 				scope.addDeclaration(node);
 			} else if (node.type === 'Identifier' && isReference(node, parent)) {
-				if (!scope.has(node.name)) {
-					globals.add(node.name);
+				if (!scope.has(node.name) && !globals.has(node.name)) {
+					globals.set(node.name, node);
 				}
 			}
 		},
diff --git a/test/runtime/samples/store-imported-module-b/_config.js b/test/runtime/samples/store-imported-module-b/_config.js
new file mode 100644
index 0000000000..8f75dcc493
--- /dev/null
+++ b/test/runtime/samples/store-imported-module-b/_config.js
@@ -0,0 +1,3 @@
+export default {
+	error: `Cannot reference store value inside <script context="module">`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported-module-b/foo.js b/test/runtime/samples/store-imported-module-b/foo.js
new file mode 100644
index 0000000000..340c3e6bd8
--- /dev/null
+++ b/test/runtime/samples/store-imported-module-b/foo.js
@@ -0,0 +1,3 @@
+import { writable } from '../../../../store.js';
+
+export default writable(42);
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported-module-b/main.svelte b/test/runtime/samples/store-imported-module-b/main.svelte
new file mode 100644
index 0000000000..7abc91d4ed
--- /dev/null
+++ b/test/runtime/samples/store-imported-module-b/main.svelte
@@ -0,0 +1,6 @@
+<script context="module">
+	import foo from './foo.js';
+	const answer = $foo;
+</script>
+
+<p>{answer}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported-module/_config.js b/test/runtime/samples/store-imported-module/_config.js
new file mode 100644
index 0000000000..c2d471a329
--- /dev/null
+++ b/test/runtime/samples/store-imported-module/_config.js
@@ -0,0 +1,5 @@
+export default {
+	html: `
+		<p>42</p>
+	`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported-module/foo.js b/test/runtime/samples/store-imported-module/foo.js
new file mode 100644
index 0000000000..340c3e6bd8
--- /dev/null
+++ b/test/runtime/samples/store-imported-module/foo.js
@@ -0,0 +1,3 @@
+import { writable } from '../../../../store.js';
+
+export default writable(42);
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported-module/main.svelte b/test/runtime/samples/store-imported-module/main.svelte
new file mode 100644
index 0000000000..8710e3d1c6
--- /dev/null
+++ b/test/runtime/samples/store-imported-module/main.svelte
@@ -0,0 +1,9 @@
+<script context="module">
+	import foo from './foo.js';
+</script>
+
+<script>
+	const answer = $foo;
+</script>
+
+<p>{answer}</p>
\ No newline at end of file