diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 877d65ec..d04ff722 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -13,6 +13,7 @@
       :key="status.id"
       :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
+      :expandable='!isExpanded'
       :focused="focused(status.id)"
       :inConversation="isExpanded"
       :highlight="getHighlight()"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 123caf16..c01cfe79 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -18,6 +18,7 @@ const Status = {
   name: 'Status',
   props: [
     'statusoid',
+    'expandable',
     'inConversation',
     'focused',
     'highlight',
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 495d088d..43c3030e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,7 +52,7 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <template v-if="!inConversation && !isPreview">
+                <template v-if="expandable && !isPreview">
                   <a href="#" @click.prevent="toggleExpanded" title="Expand">
                     <i class="button-icon icon-plus-squared"></i>
                   </a>