diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index d039f38a..f1c0121f 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -39,7 +39,7 @@
 				<span>In reply to</span>
 				<actor-avatar :actor="replyTo.actor_info" :size="16" />
 				<strong>{{ replyTo.actor_info.account }}</strong>
-				<a class="icon-close" @click="replyTo=null" />
+				<a class="icon-close" @click="closeReply()" />
 			</p>
 			<div class="reply-to-preview">
 				{{ replyTo.content }}
@@ -830,6 +830,11 @@ export default {
 			})
 
 		},
+		closeReply() {
+			this.replyTo = null
+			// View may want to hide the composer
+			this.$store.commit('setComposerDisplayStatus', false)
+		},
 		remoteSearchAccounts(text) {
 			return axios.get(generateUrl('apps/social/api/v1/global/accounts/search?search=' + text))
 		},
diff --git a/src/store/timeline.js b/src/store/timeline.js
index 0bb4aa01..031f3306 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -48,7 +48,8 @@ const state = {
 	 */
 	params: {},
 	account: '',
-	/* Tells whether the composer should be displayed or not
+	/* Tells whether the composer should be displayed or not.
+	 * It's up to the view to honor this status or not.
 	 * @member {boolean}
 	 */
 	composerDisplayStatus: false