diff --git a/src/compile/nodes/Element.ts b/src/compile/nodes/Element.ts
index bee1103dc09c..a3040b81c241 100644
--- a/src/compile/nodes/Element.ts
+++ b/src/compile/nodes/Element.ts
@@ -855,8 +855,8 @@ export default class Element extends Node {
 			const { expression } = action;
 			let snippet, dependencies;
 			if (expression) {
-				snippet = action.expression.snippet;
-				dependencies = action.expression.dependencies;
+				snippet = expression.snippet;
+				dependencies = expression.dependencies;
 			}
 
 			const name = block.getUniqueName(
@@ -889,14 +889,22 @@ export default class Element extends Node {
 
 	addClasses(block: Block) {
 		this.classes.forEach(classDir => {
-			const { expression: { snippet, dependencies}, name } = classDir;
+			const { expression, name } = classDir;
+			let snippet, dependencies;
+			if (expression) {
+				snippet = expression.snippet;
+				dependencies = expression.dependencies;
+			} else {
+				snippet = `ctx${quotePropIfNecessary(name)}`;
+				dependencies = [name];
+			}
 			const updater = `@toggleClass(${this.var}, "${name}", ${snippet});`;
 
 			block.builders.hydrate.addLine(updater);
 
 			if ((dependencies && dependencies.size > 0) || this.classDependencies.length) {
 				const allDeps = this.classDependencies.concat(...dependencies);
-				const deps = allDeps.map(dependency => `changed.${dependency}`).join(' || ');
+				const deps = allDeps.map(dependency => `changed${quotePropIfNecessary(dependency)}`).join(' || ');
 				const condition = allDeps.length > 1 ? `(${deps})` : deps;
 
 				block.builders.update.addConditional(
@@ -978,7 +986,8 @@ export default class Element extends Node {
 		}
 
 		const classExpr = this.classes.map((classDir: Class) => {
-			const { expression: { snippet }, name } = classDir;
+			const { expression, name } = classDir;
+			const snippet = expression ? expression.snippet : `ctx${quotePropIfNecessary(name)}`;
 			return `${snippet} ? "${name}" : ""`;
 		}).join(', ');
 
@@ -1026,7 +1035,7 @@ export default class Element extends Node {
 					openingTag += '${' + attribute.chunks[0].snippet + ' ? " ' + attribute.name + '" : "" }';
 				} else if (attribute.name === 'class' && classExpr) {
 					addClassAttribute = false;
-					openingTag += ` class="\${ [\`${attribute.stringifyForSsr()}\`, ${classExpr} ].join(' ') }"`;
+					openingTag += ` class="\${ [\`${attribute.stringifyForSsr()}\`, ${classExpr} ].join(' ').trim() }"`;
 				} else {
 					openingTag += ` ${attribute.name}="${attribute.stringifyForSsr()}"`;
 				}
@@ -1034,7 +1043,7 @@ export default class Element extends Node {
 		}
 
 		if (addClassAttribute) {
-			openingTag += ` class="\${ [${classExpr}].join(' ') }"`;
+			openingTag += ` class="\${ [${classExpr}].join(' ').trim() }"`;
 		}
 
 		openingTag += '>';
diff --git a/src/css/Selector.ts b/src/css/Selector.ts
index 80e722a483a1..ed8a4f60dff7 100644
--- a/src/css/Selector.ts
+++ b/src/css/Selector.ts
@@ -157,7 +157,7 @@ function applySelector(stylesheet: Stylesheet, blocks: Block[], node: Node, stac
 		}
 
 		if (selector.type === 'ClassSelector') {
-			if (!attributeMatches(node, 'class', selector.name, '~=', false)) return false;
+			if (!attributeMatches(node, 'class', selector.name, '~=', false) && !classMatches(node, selector.name)) return false;
 		}
 
 		else if (selector.type === 'IdSelector') {
@@ -258,6 +258,12 @@ function attributeMatches(node: Node, name: string, expectedValue: string, opera
 	return false;
 }
 
+function classMatches(node, name: string) {
+	return node.classes.some(function(classDir) {
+		return classDir.name === name;
+	});
+}
+
 function isDynamic(value: Node) {
 	return value.length > 1 || value[0].type !== 'Text';
 }
diff --git a/test/runtime/samples/class-shortcut/_config.js b/test/runtime/samples/class-shortcut/_config.js
new file mode 100644
index 000000000000..2d36b6eabfca
--- /dev/null
+++ b/test/runtime/samples/class-shortcut/_config.js
@@ -0,0 +1,16 @@
+export default {
+	data: {
+		"is-active": true,
+		isSelected: true,
+		myClass: 'one two'
+	},
+	html: `<div class="one two is-active isSelected"></div>`,
+
+	test ( assert, component, target, window ) {
+		component.set({ "is-active": false });
+
+		assert.htmlEqual( target.innerHTML, `
+			<div class="one two isSelected"></div>
+		` );
+	}
+};
diff --git a/test/runtime/samples/class-shortcut/main.html b/test/runtime/samples/class-shortcut/main.html
new file mode 100644
index 000000000000..8e608c33e7e5
--- /dev/null
+++ b/test/runtime/samples/class-shortcut/main.html
@@ -0,0 +1 @@
+<div class="{ myClass }" class:is-active class:isSelected class:not-used></div>