diff --git a/CardStack.js b/CardStack.js
index 552eb1b..3502d92 100644
--- a/CardStack.js
+++ b/CardStack.js
@@ -136,9 +136,13 @@ export default class CardStack extends Component {
   }
 
   componentWillReceiveProps(nextProps){
-    this.setState({
+    if (nextProps.children !== this.props.children) {
+      this.setState({
       cards: nextProps.children,
+      cardA: nextProps.children[0],
+      cardB: nextProps.children[1],
     });
+    }
   }
 
   _resetCard(){