diff --git a/client/modules/IDE/components/TextOutput.jsx b/client/modules/IDE/components/TextOutput.jsx
index bdd7c35a..67d67db6 100644
--- a/client/modules/IDE/components/TextOutput.jsx
+++ b/client/modules/IDE/components/TextOutput.jsx
@@ -1,9 +1,15 @@
-import React from 'react';
+import React, { PropTypes } from 'react';
 
 class TextOutput extends React.Component {
   componentDidMount() {
     this.canvasTextOutput.focus();
   }
+  componentDidUpdate(prevProps) {
+    // if the user explicitly clicks on the play button, want to refocus on the text output
+    if (this.props.isPlaying && this.props.previewIsRefreshing) {
+      this.canvasTextOutput.focus();
+    }
+  }
   render() {
     return (
       <section
@@ -43,4 +49,9 @@ class TextOutput extends React.Component {
   }
 }
 
+TextOutput.propTypes = {
+  isPlaying: PropTypes.bool.isRequired,
+  previewIsRefreshing: PropTypes.bool.isRequired
+};
+
 export default TextOutput;
diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx
index bf6bbca3..bf097d7e 100644
--- a/client/modules/IDE/pages/IDEView.jsx
+++ b/client/modules/IDE/pages/IDEView.jsx
@@ -329,7 +329,10 @@ class IDEView extends React.Component {
                   {(() => {
                     if ((this.props.preferences.textOutput && this.props.ide.isPlaying) || this.props.ide.isTextOutputPlaying) {
                       return (
-                        <TextOutput />
+                        <TextOutput
+                          isPlaying={this.props.ide.isPlaying}
+                          previewIsRefreshing={this.props.ide.previewIsRefreshing}
+                        />
                       );
                     }
                     return '';