diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss
index 0b144c700..b2d61bc22 100644
--- a/app/styles/components/compose-form.scss
+++ b/app/styles/components/compose-form.scss
@@ -284,7 +284,7 @@
     .compose-form__upload-thumbnail {
       border-radius: 4px;
       background-position: center;
-      background-size: cover;
+      background-size: contain;
       background-repeat: no-repeat;
       height: 140px;
       width: 100%;
diff --git a/app/styles/components/media-gallery.scss b/app/styles/components/media-gallery.scss
index 431610bb6..c98d212b3 100644
--- a/app/styles/components/media-gallery.scss
+++ b/app/styles/components/media-gallery.scss
@@ -31,6 +31,10 @@
   .still-image {
     height: 100%;
     width: 100%;
+
+    img {
+      object-fit: contain;
+    }
   }
 
   .still-image--play-on-hover::before {