diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 0e2a228a94..1cb53c3298 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -4,7 +4,10 @@
       <img :key="nsfwImage" :src="nsfwImage"></img>
     </a>
 
-    <a class="image-attachment" v-if="type === 'image' && !nsfw" :href="attachment.url" target="_blank"><img :src="attachment.url"></img></a>
+    <a class="image-attachment" v-if="type === 'image' && !nsfw"
+      :href="attachment.url" target="_blank">
+      <img :src="attachment.url"></img>
+    </a>
 
     <video v-if="type === 'video' && !nsfw" :src="attachment.url" controls></video>
 
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index a935a9840b..71787cc5d8 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -7,6 +7,9 @@
       <div class="attachments">
         <div class="attachment" v-for="file in newStatus.files">
           <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img>
+          <video v-if="type(file) === 'video'" :src="file.image" controls></video>
+          <audio v-if="type(file) === 'audio'" :src="file.image" controls></audio>
+          <a v-if="type(file) === 'unknown'" :href="file.image">{{file.url}}</a>
         </div>
       </div>
       <div class='form-bottom'>