diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 163dd74fd..d9bc44774 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -33,6 +33,9 @@ const Attachment = {
     },
     isSmall () {
       return this.size === 'small'
+    },
+    fullwidth () {
+      return fileTypeService.fileType(this.attachment.mimetype) === 'html'
     }
   },
   methods: {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index e2cc1ac06..b2f636689 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -2,7 +2,7 @@
   <div v-if="size==='hide'">
     <a class="placeholder" v-if="type !== 'html'" target="_blank" :href="attachment.url">[{{nsfw ? "NSFW/" : ""}}{{type.toUpperCase()}}]</a>
   </div>
-  <div v-else class="attachment" :class="{[type]: true, loading, 'small-attachment': isSmall}" v-show="!isEmpty">
+  <div v-else class="attachment" :class="{[type]: true, loading, 'small-attachment': isSmall, 'fullwidth': fullwidth}" v-show="!isEmpty">
     <a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
       <img :key="nsfwImage" :src="nsfwImage"/>
     </a>
@@ -71,6 +71,9 @@
     border-color: var(--border, $fallback--border);
     overflow: hidden;
   }
+  .fullwidth {
+    flex-basis: 100%;
+  }
   // fixes small gap below video
   &.video {
     line-height: 0;
@@ -117,6 +120,7 @@
 
   .oembed {
     line-height: 1.2em;
+    flex: 1 0 100%;
     width: 100%;
     margin-right: 15px;
     display: flex;