diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css
index fd29e756a..eb98adc1a 100644
--- a/ui/assets/css/main.css
+++ b/ui/assets/css/main.css
@@ -157,4 +157,5 @@ hr {
 
 .fl-1 {
   flex: 1;
-}
\ No newline at end of file
+}
+
diff --git a/ui/src/components/post-listing.tsx b/ui/src/components/post-listing.tsx
index 7e7a8852b..c945806bd 100644
--- a/ui/src/components/post-listing.tsx
+++ b/ui/src/components/post-listing.tsx
@@ -136,18 +136,22 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             </button>
           )}
         </div>
-        {post.url && isImage(post.url) && !post.nsfw && !post.community_nsfw && (
-          <span
-            title={i18n.t('expand_here')}
-            class="pointer"
-            onClick={linkEvent(this, this.handleImageExpandClick)}
-          >
-            <img
-              class="mx-2 mt-1 float-left img-fluid thumbnail rounded"
-              src={imageThumbnailer(post.url)}
-            />
-          </span>
-        )}
+        {post.url &&
+          isImage(post.url) &&
+          !post.nsfw &&
+          !post.community_nsfw &&
+          !this.state.imageExpanded && (
+            <span
+              title={i18n.t('expand_here')}
+              class="pointer"
+              onClick={linkEvent(this, this.handleImageExpandClick)}
+            >
+              <img
+                class="mx-2 mt-1 float-left img-fluid thumbnail rounded"
+                src={imageThumbnailer(post.url)}
+              />
+            </span>
+          )}
         {post.url && isVideo(post.url) && (
           <video
             playsinline