diff --git a/client/app/scripts/components/embedded-terminal.js b/client/app/scripts/components/embedded-terminal.js
index 6593578d5..deed71308 100644
--- a/client/app/scripts/components/embedded-terminal.js
+++ b/client/app/scripts/components/embedded-terminal.js
@@ -17,9 +17,17 @@ class EmeddedTerminal extends React.Component {
   }
 
   componentDidMount() {
-    setTimeout(() => {
+    this.mountedTimeout = setTimeout(() => {
       this.setState({mounted: true});
     });
+    this.animationTimeout = setTimeout(() => {
+      this.setState({ animated: true });
+    }, 2000);
+  }
+
+  componentWillUnmount() {
+    clearTimeout(this.mountedTimeout);
+    clearTimeout(this.animationTimeout);
   }
 
   getTransform() {