diff --git a/addon/components/paper-form.js b/addon/components/paper-form.js
index 69c613193..72f6e6213 100644
--- a/addon/components/paper-form.js
+++ b/addon/components/paper-form.js
@@ -5,12 +5,10 @@ const { Component, computed, on, observer } = Ember;
 
 export default Component.extend(ParentMixin, {
   tagName: '',
-  isValid: computed.not('childComponents.@each.isInvalid', function() {
-    return this.get('childComponents').isAny('isInvalid');
-  }),
-  isInvalid: computed.not('isValid', function() {
-    return this.get('isValid');
+  isValid: computed('childComponents.@each.isInvalid', function() {
+    return !this.get('childComponents').isAny('isInvalid');
   }),
+  isInvalid: computed.not('isValid'),
   sendToParent: on('init', observer('isValid', function() {
     if (!this.get('parentAction')) {
       return;