diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
index a6f66d3736b655bb1835539cd73115feac761ceb..fa3b5313cfa72f48a368757e320f9dea18b6ce79 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
@@ -40,22 +40,20 @@ const ManuscriptEicDecision = ({
         </ItemOverrideAlert>
       </Row>
 
-      <Row mt={2}>
-        <Item vertical>
-          <Label required>
-            {
-              messagesLabel[
-                get(formValues, 'decision', 'return-to-handling-editor')
-              ]
-            }
-          </Label>
-          <ValidatedField
-            component={ValidatedTextArea}
-            name="message"
-            validate={[required]}
-          />
-        </Item>
-      </Row>
+      {get(formValues, 'decision') !== 'publish' && (
+        <Row mt={2}>
+          <Item vertical>
+            <Label required>
+              {messagesLabel[get(formValues, 'decision', 'reject')]}
+            </Label>
+            <ValidatedField
+              component={ValidatedTextArea}
+              name="message"
+              validate={[required]}
+            />
+          </Item>
+        </Row>
+      )}
 
       <Row justify="flex-end" mt={4}>
         <Button onClick={handleSubmit} primary size="medium">
diff --git a/packages/component-manuscript/src/components/EditorialCommentCard.js b/packages/component-manuscript/src/components/EditorialCommentCard.js
index aa9187971fa82db28b3a3896b7fafb78c4520622..67c882a3bb8257f6ce5129c1b320fe1f1aa7686d 100644
--- a/packages/component-manuscript/src/components/EditorialCommentCard.js
+++ b/packages/component-manuscript/src/components/EditorialCommentCard.js
@@ -6,8 +6,14 @@ import {
   withFileDownload,
 } from 'pubsweet-component-faraday-ui'
 
-const EditorialCommentCard = ({ journal, reports = [] }) => (
-  <ContextualBox label="Editorial Comments" mb={2}>
+const EditorialCommentCard = ({ journal, reports = [], toggle, expanded }) => (
+  <ContextualBox
+    expanded={expanded}
+    label="Editorial Comments"
+    mb={2}
+    scrollIntoView
+    toggle={toggle}
+  >
     {reports.map(report => (
       <EditorialReportCard journal={journal} key={report.id} report={report} />
     ))}
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 2450088dfa1d23f29cd9070bd21735f3a1f5d440..ae00e1870d9123677b1c80e2e771009c7a5b4e8b 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -26,7 +26,6 @@ const eicDecisions = [
 
 const messagesLabel = {
   'return-to-handling-editor': 'Comments for Handling Editor',
-  publish: 'Comments for Author',
   reject: 'Comments for Author',
 }
 
@@ -69,6 +68,8 @@ const ManuscriptLayout = ({
   reviewerRecommendations,
   toggleReviewerDetails,
   reviewerDetailsExpanded,
+  toggleHeRecommendation,
+  heRecommendationExpanded,
 }) => (
   <Root pb={30}>
     {!isEmpty(collection) && !isEmpty(fragment) ? (
@@ -103,8 +104,10 @@ const ManuscriptLayout = ({
         {get(currentUser, 'permissions.canViewReports', true) &&
           !!editorialRecommendations.length && (
             <EditorialCommentCard
+              expanded={heRecommendationExpanded}
               journal={journal}
               reports={editorialRecommendations}
+              toggle={toggleHeRecommendation}
             />
           )}
 
@@ -194,6 +197,7 @@ const ManuscriptLayout = ({
         {get(currentUser, 'permissions.canMakeDecision', false) && (
           <ManuscriptEicDecision
             formValues={get(formValues, 'eicDecision')}
+            highlight={editorialRecommendations.length > 0}
             messagesLabel={messagesLabel}
             mt={2}
             options={
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index aa69fb6d10850f9150dc2c078216f437074dfe2d..aaac6b3b8f9c64f2abf4268d36b278dd647aa080 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -425,6 +425,10 @@ export default compose(
     toggleReviewerDetails: toggle,
     reviewerDetailsExpanded: expanded,
   })),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleHeRecommendation: toggle,
+    heRecommendationExpanded: expanded,
+  })),
   withProps(({ currentUser, collection, submittedOwnRecommendation }) => ({
     getSignedUrl,
     shouldReview:
@@ -443,7 +447,13 @@ export default compose(
         clearCustomError,
         hasManuscriptFailure,
         fetchUpdatedCollection,
-        currentUser: { isInvitedHE, isInvitedToReview, isHEToManuscript },
+        editorialRecommendations,
+        currentUser: {
+          isInvitedHE,
+          isInvitedToReview,
+          isHEToManuscript,
+          isEIC,
+        },
       } = this.props
       if (hasManuscriptFailure) {
         history.push('/not-found')
@@ -479,6 +489,10 @@ export default compose(
       if (isHEToManuscript && !!reviewerReports.length) {
         this.props.toggleReviewerDetails()
       }
+
+      if (isEIC && !!editorialRecommendations.length) {
+        this.props.toggleHeRecommendation()
+      }
     },
   }),
 )(ManuscriptLayout)
diff --git a/packages/components-faraday/src/components/MakeDecision/DecisionForm.js b/packages/components-faraday/src/components/MakeDecision/DecisionForm.js
index 3fab58f21c15bcdd312cc0fa0f8df64ef928350e..b698cf1f41d8b9c2fac0ba97fa7b01f588eac0ce 100644
--- a/packages/components-faraday/src/components/MakeDecision/DecisionForm.js
+++ b/packages/components-faraday/src/components/MakeDecision/DecisionForm.js
@@ -73,7 +73,7 @@ const DecisionForm = ({
     {decision === 'return-to-handling-editor' && (
       <Row>
         <RowItem vertical>
-          <Label>Comments for Handling Editor</Label>
+          <Label>Comments for Author</Label>
           <ValidatedField
             component={TextAreaField}
             name="messageToHE"