--- a/devtools/client/webconsole/new-console-output/components/console-output.js
+++ b/devtools/client/webconsole/new-console-output/components/console-output.js
@@ -22,26 +22,25 @@ const ConsoleOutput = createClass({
     // This function is created in mergeProps
     openVariablesView: PropTypes.func.isRequired,
     messages: PropTypes.array.isRequired
   },
 
   displayName: "ConsoleOutput",
 
   componentWillUpdate() {
-    // @TODO Move this to a parent component.
-    let node = ReactDOM.findDOMNode(this).parentNode.parentNode.parentNode;
+    let node = ReactDOM.findDOMNode(this);
     if (node.lastChild) {
       this.shouldScrollBottom = isScrolledToBottom(node.lastChild, node);
     }
   },
 
   componentDidUpdate() {
     if (this.shouldScrollBottom) {
-      let node = ReactDOM.findDOMNode(this).parentNode.parentNode.parentNode;
+      let node = ReactDOM.findDOMNode(this);
       node.scrollTop = node.scrollHeight;
     }
   },
 
   render() {
     let messageNodes = this.props.messages.map(function (message) {
       return (
         MessageContainer({ message })