diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index d46042df8..753455d8d 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -23,10 +23,11 @@ import PermalinkButton from '../../coral-plugin-permalinks/PermalinkButton';
 import SignInContainer from '../../coral-sign-in/containers/SignInContainer';
 import UserBox from '../../coral-sign-in/components/UserBox';
 
-import {TabBar, Tab, TabContent, Spinner, Button} from '../../coral-ui';
+import {TabBar, Tab, TabContent, Spinner} from '../../coral-ui';
 import SettingsContainer from '../../coral-settings/containers/SettingsContainer';
 import RestrictedContent from '../../coral-framework/components/RestrictedContent';
 import SuspendedAccount from '../../coral-framework/components/SuspendedAccount';
+import CloseCommentsInfo from '../../coral-framework/components/CloseCommentsInfo';
 
 const {addItem, updateItem, postItem, getStream, postAction, deleteAction, appendItemArray} = itemActions;
 const {addNotification, clearNotification} = notificationActions;
@@ -122,10 +123,10 @@ class CommentStream extends Component {
                         reply={false}
                         author={user}
                       />
-                      {!loggedIn && <SignInContainer />}
                     </div>
                   : <p>Comments are closed for this thread.</p>
                 }
+                {!loggedIn && <SignInContainer />}
                 {
                   rootItem.comments && rootItem.comments.map((commentId) => {
                     const comment = comments[commentId];
@@ -266,25 +267,6 @@ class CommentStream extends Component {
   }
 }
 
-const CloseCommentsInfo = ({status, onClick}) => status === 'open' ? (
-  <div className="close-comments-intro-wrapper">
-    <p>
-      This comment stream is currently open. By closing this comment stream,
-      no new comments may be submitted and all previous comments will still
-      be displayed.
-    </p>
-    <Button onClick={onClick}>Close Stream</Button>
-  </div>
-) : (
-  <div className="close-comments-intro-wrapper">
-    <p>
-      This comment stream is currently closed. By opening this comment stream,
-      new comments may be submitted and displayed
-    </p>
-    <Button onClick={onClick}>Open Stream</Button>
-  </div>
-);
-
 const mapStateToProps = state => ({
   config: state.config.toJS(),
   items: state.items.toJS(),
diff --git a/client/coral-framework/components/CloseCommentsInfo.js b/client/coral-framework/components/CloseCommentsInfo.js
new file mode 100644
index 000000000..627328f9b
--- /dev/null
+++ b/client/coral-framework/components/CloseCommentsInfo.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import {Button} from 'coral-ui';
+
+export default ({status, onClick}) => (
+  status === 'open' ? (
+    <div className="close-comments-intro-wrapper">
+      <p>
+        This comment stream is currently open. By closing this comment stream,
+        no new comments may be submitted and all previous comments will still
+        be displayed.
+      </p>
+      <Button onClick={onClick}>Close Stream</Button>
+    </div>
+  ) : (
+    <div className="close-comments-intro-wrapper">
+      <p>
+        This comment stream is currently closed. By opening this comment stream,
+        new comments may be submitted and displayed
+      </p>
+      <Button onClick={onClick}>Open Stream</Button>
+    </div>
+  )
+);