diff --git a/src/assets/scss/_view-mode-grid.scss b/src/assets/scss/_view-mode-grid.scss
index d5f09ea..c6721cd 100644
--- a/src/assets/scss/_view-mode-grid.scss
+++ b/src/assets/scss/_view-mode-grid.scss
@@ -21,8 +21,17 @@
         display: block;
         text-decoration: none !important;
 
+        .thumbnail-container {
+            margin: 0;
+            padding: 0;
+            background-color: #f6f6f6;
+            height: 255px;
+        }
+
         img {
-            width: 255px;
+            max-width: 255px;
+            max-height: 255px;
+            width: auto;
             height: auto;
             border-radius: 0px;
         }
diff --git a/src/tainacan/view-mode-grid.php b/src/tainacan/view-mode-grid.php
index cc65c1a..bd051d7 100644
--- a/src/tainacan/view-mode-grid.php
+++ b/src/tainacan/view-mode-grid.php
@@ -9,7 +9,9 @@
 					<?php the_title(); ?>           
 				</p>
 				<?php if ( has_post_thumbnail() ) : ?>
-					<?php the_post_thumbnail( 'tainacan-medium' ); ?> 
+					<div class="thumbnail-container">
+						<?php the_post_thumbnail( 'tainacan-medium' ); ?> 
+					</div>
 				<?php else : ?>
 					<?php echo '<img alt="Thumbnail placeholder" src="' . get_template_directory_uri() . '/assets/images/thumbnail_placeholder.png">'?>
 				<?php endif; ?>