diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index a6f79d76..b536b91c 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -90,6 +90,17 @@ const StatusContent = {
       }
       return true
     },
+    tagsSorted () {
+      return this.status.tags.sort((a, b) => {
+        if (a.name < b.name) {
+          return -1
+        }
+        if (a.name > b.name) {
+          return 1
+        }
+        return 0
+      })
+    },
     attachmentSize () {
       if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
         (this.mergedConfig.hideAttachmentsInConv && this.inConversation) ||
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 90bfaf40..2544a5e6 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -87,6 +87,17 @@
       </button>
     </div>
 
+    <div v-if="status.tags.length !== 0">
+      <a
+        v-for="tag in tagsSorted"
+        :key="tag.name"
+        :href="tag.url"
+        class="btn button-default status-tag"
+      >
+        {{ tag.name }}
+      </a>
+    </div>
+
     <div v-if="status.poll && status.poll.options && !hideSubjectStatus">
       <poll :base-poll="status.poll" />
     </div>
@@ -140,6 +151,11 @@ $status-margin: 0.75em;
   flex: 1;
   min-width: 0;
 
+  .status-tag {
+    padding: 2px;
+    margin: 2px;
+  }
+
   .status-content-wrapper {
     display: flex;
     flex-direction: column;