   #   - it's not a focused discussion OR
   #   - it's a focused discussion and this comment's focus is different
   shouldShowFocus: ->
-    return false unless @props.data.focus_id
+    return false unless @state.subject?
     return false if @props.hideFocus
 
     notInDiscussion = not @props.index

    editing: false
    commentValidationErrors: []
    replies: []

  contextTypes:
    geordi: React.PropTypes.object

      profile_link = "/projects/#{@props.project.slug}#{profile_link}"
    <div className="talk-comment #{activeClass} #{isDeleted}">
      <div className="talk-comment-author">
        {<Avatar user={@state.commentOwner} /> if @state.commentOwner?}
        <div>
          <Link to={profile_link}>{@props.data.user_display_name}</Link>
          <div className="user-mention-name">@{@props.data.user_login}</div>
        </div>
        <DisplayRoles roles={@state.roles} section={@props.data.section} />
      </div>

      <div className="talk-comment-body">
