2 files changed, 6 insertions, 5 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index cc19714d..41730720 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -16,7 +16,7 @@ const Attachment = {
       loopVideo: this.$store.state.config.loopVideo,
       showHidden: false,
       loading: false,
-      img: this.type === 'image' && document.createElement('img')
+      img: fileTypeService.fileType(this.attachment.mimetype) === 'image' && document.createElement('img')
     }
   },
   components: {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index bbb43679..8795b131 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -51,6 +51,10 @@
 
   .nsfw-placeholder {
     cursor: pointer;
+
+    &.loading {
+      cursor: progress;
+    }
   }
 
   .small-attachment {
@@ -61,6 +65,7 @@
   }
 
   .attachment {
+    position: relative;
     flex: 1 0 30%;
     margin: 0.5em 0.7em 0.6em 0.0em;
     align-self: flex-start;
@@ -88,10 +93,6 @@
     display: flex;
   }
 
-  &.loading {
-    cursor: progress;
-  }
-
   .hider {
     position: absolute;
     margin: 10px;