diff --git a/src/components/post/expando/expando.module.css b/src/components/post/expando/expando.module.css
index f05a91ce..606c4b13 100644
--- a/src/components/post/expando/expando.module.css
+++ b/src/components/post/expando/expando.module.css
@@ -60,6 +60,7 @@
   border: 1px solid var(--text-primary);
   background-color: black;
   color: black;
+  z-index: 1;
   cursor: pointer;
 }
 
@@ -67,6 +68,7 @@
   color: white;
   text-transform: lowercase;
   position: absolute;
+  z-index: 1;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
diff --git a/src/components/post/expando/expando.tsx b/src/components/post/expando/expando.tsx
index 54728243..ea647449 100644
--- a/src/components/post/expando/expando.tsx
+++ b/src/components/post/expando/expando.tsx
@@ -47,7 +47,8 @@ const Expando = ({ commentMediaInfo, content, expanded, link, reason, removed, s
         spoiler && !showSpoiler && setShowSpoiler(true);
       }}
     >
-      {link && !removed && !(spoiler && !showSpoiler) && (
+      <div className={spoiler && !showSpoiler ? styles.hideSpoiler : ''} />
+      {link && !removed && (
         <div className={styles.mediaPreview}>
           <Link
             to={link}
@@ -64,7 +65,6 @@ const Expando = ({ commentMediaInfo, content, expanded, link, reason, removed, s
       )}
       {content && showContent && (
         <div className={styles.usertext}>
-          <div className={spoiler && !showSpoiler ? styles.hideSpoiler : ''} />
           <div className={styles.markdown}>
             {spoiler && !showSpoiler && <div className={styles.showSpoilerButton}>{t('view_spoiler')}</div>}
             <Markdown content={content} />
diff --git a/src/components/post/post.tsx b/src/components/post/post.tsx
index 2762d5ca..4a79734c 100644
--- a/src/components/post/post.tsx
+++ b/src/components/post/post.tsx
@@ -184,7 +184,7 @@ const Post = ({ index, post = {} }: PostProps) => {
                   <div className={`${styles.arrowCommon} ${downvoted ? styles.downvoted : styles.arrowDown}`} onClick={() => cid && downvote()} />
                 </div>
               </div>
-              {hasThumbnail && !isInPostView && (
+              {hasThumbnail && !isInPostView && !spoiler && (
                 <span className={removed ? styles.blur : ''}>
                   <Thumbnail
                     cid={cid}