diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 27f453377244f8c5b23de6b2c77b9c62b85fc5dd..d2445c23e6e231fae50c65f5970ae94da0253b39 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -50,7 +50,7 @@ const ManuscriptLayout = ({
   heResponseExpanded,
   toggleReviewerResponse,
   invitationsWithReviewers,
-  responseToRevisionRequest,
+  responseToRevisionRequestExpanded,
   publonReviewers,
   reviewerResponseExpanded,
   pendingOwnRecommendation,
@@ -58,7 +58,6 @@ const ManuscriptLayout = ({
   reviewerRecommendationExpanded,
   authorResponseToRevisonRequest,
   toggleResponeToRevisionRequest,
-  responseToRevisionRequestExpanded,
   shouldReview,
   submittedOwnRecommendation,
   reviewerReports,
@@ -140,7 +139,7 @@ const ManuscriptLayout = ({
         {get(currentUser, 'permissions.canViewResponseFromAuthor', false) && (
           <ResponseToRevisionRequest
             authorReply={get(fragment, 'responseToReviewers', {})}
-            expanded={responseToRevisionRequest}
+            expanded={responseToRevisionRequestExpanded}
             fragment={fragment}
             getSignedUrl={getSignedUrl}
             toggle={toggleResponseToRevisionRequest}
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index 030805e20e8baeb68ab9919f3cf34379c392ca51..8e7d53639af1c42d026b288996a04e2f9f957d9c 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -290,7 +290,7 @@ export default compose(
   })),
   fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
     toggleResponseToRevisionRequest: toggle,
-    responseToRevisionRequest: expanded,
+    responseToRevisionRequestExpanded: expanded,
   })),
   fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
     toggleReviewerDetails: toggle,
@@ -385,7 +385,8 @@ export default compose(
 
       if (
         get(fragment, 'responseToReviewers.content', false) &&
-        !editorialRecommendations.length
+        !editorialRecommendations.length &&
+        !reviewerReports.length
       ) {
         this.props.toggleResponseToRevisionRequest()
       }