diff --git a/src/components/media.jsx b/src/components/media.jsx
index f8e2ead3..943db1e0 100644
--- a/src/components/media.jsx
+++ b/src/components/media.jsx
@@ -1,4 +1,5 @@
 import { getBlurHashAverageColor } from 'fast-blurhash';
+import { Fragment } from 'preact';
 import {
   useCallback,
   useLayoutEffect,
@@ -251,90 +252,104 @@ function Media({ media, to, showOriginal, autoAnimate, onClick = () => {} }) {
     ></video>
   `;
 
+    const showInlineDesc = !showOriginal && !isGIF && !!description;
+    const Container = showInlineDesc ? 'figure' : Fragment;
+
     return (
-      <Parent
-        class={`media media-${isGIF ? 'gif' : 'video'} ${
-          autoGIFAnimate ? 'media-contain' : ''
-        }`}
-        data-orientation={orientation}
-        data-formatted-duration={formattedDuration}
-        data-label={isGIF && !showOriginal && !autoGIFAnimate ? 'GIF' : ''}
-        // style={{
-        //   backgroundColor:
-        //     rgbAverageColor && `rgb(${rgbAverageColor.join(',')})`,
-        // }}
-        style={!showOriginal && mediaStyles}
-        onClick={(e) => {
-          if (hoverAnimate) {
-            try {
-              videoRef.current.pause();
-            } catch (e) {}
-          }
-          onClick(e);
-        }}
-        onMouseEnter={() => {
-          if (hoverAnimate) {
-            try {
-              videoRef.current.play();
-            } catch (e) {}
-          }
-        }}
-        onMouseLeave={() => {
-          if (hoverAnimate) {
-            try {
-              videoRef.current.pause();
-            } catch (e) {}
-          }
-        }}
-      >
-        {showOriginal || autoGIFAnimate ? (
-          isGIF && showOriginal ? (
-            <QuickPinchZoom {...quickPinchZoomProps} enabled>
+      <Container>
+        <Parent
+          class={`media media-${isGIF ? 'gif' : 'video'} ${
+            autoGIFAnimate ? 'media-contain' : ''
+          }`}
+          data-orientation={orientation}
+          data-formatted-duration={formattedDuration}
+          data-label={isGIF && !showOriginal && !autoGIFAnimate ? 'GIF' : ''}
+          // style={{
+          //   backgroundColor:
+          //     rgbAverageColor && `rgb(${rgbAverageColor.join(',')})`,
+          // }}
+          style={!showOriginal && mediaStyles}
+          onClick={(e) => {
+            if (hoverAnimate) {
+              try {
+                videoRef.current.pause();
+              } catch (e) {}
+            }
+            onClick(e);
+          }}
+          onMouseEnter={() => {
+            if (hoverAnimate) {
+              try {
+                videoRef.current.play();
+              } catch (e) {}
+            }
+          }}
+          onMouseLeave={() => {
+            if (hoverAnimate) {
+              try {
+                videoRef.current.pause();
+              } catch (e) {}
+            }
+          }}
+        >
+          {showOriginal || autoGIFAnimate ? (
+            isGIF && showOriginal ? (
+              <QuickPinchZoom {...quickPinchZoomProps} enabled>
+                <div
+                  ref={mediaRef}
+                  dangerouslySetInnerHTML={{
+                    __html: videoHTML,
+                  }}
+                />
+              </QuickPinchZoom>
+            ) : (
               <div
-                ref={mediaRef}
+                class="video-container"
                 dangerouslySetInnerHTML={{
                   __html: videoHTML,
                 }}
               />
-            </QuickPinchZoom>
-          ) : (
-            <div
-              class="video-container"
-              dangerouslySetInnerHTML={{
-                __html: videoHTML,
-              }}
-            />
-          )
-        ) : isGIF ? (
-          <video
-            ref={videoRef}
-            src={url}
-            poster={previewUrl}
-            width={width}
-            height={height}
-            data-orientation={orientation}
-            preload="auto"
-            // controls
-            playsinline
-            loop
-            muted
-          />
-        ) : (
-          <>
-            <img
-              src={previewUrl}
-              alt={description}
+            )
+          ) : isGIF ? (
+            <video
+              ref={videoRef}
+              src={url}
+              poster={previewUrl}
               width={width}
               height={height}
               data-orientation={orientation}
-              loading="lazy"
+              preload="auto"
+              // controls
+              playsinline
+              loop
+              muted
             />
-            <div class="media-play">
-              <Icon icon="play" size="xl" />
-            </div>
-          </>
+          ) : (
+            <>
+              <img
+                src={previewUrl}
+                alt={description}
+                width={width}
+                height={height}
+                data-orientation={orientation}
+                loading="lazy"
+              />
+              <div class="media-play">
+                <Icon icon="play" size="xl" />
+              </div>
+            </>
+          )}
+        </Parent>
+        {showInlineDesc && (
+          <figcaption
+            onClick={() => {
+              location.hash = to;
+            }}
+          >
+            {description}
+          </figcaption>
         )}
-      </Parent>
+      </Container>
     );
   } else if (type === 'audio') {
     const formattedDuration = formatDuration(original.duration);
diff --git a/src/components/status.css b/src/components/status.css
index 8d336993..6a1975fe 100644
--- a/src/components/status.css
+++ b/src/components/status.css
@@ -654,6 +654,31 @@
   width: auto !important;
   max-width: 100%;
   display: block;
+
+  figure {
+    margin: 0;
+    padding: 0;
+
+    figcaption {
+      margin: -2px 0 0;
+      padding: 0 4px;
+      font-size: 90%;
+      color: var(--text-insignificant-color);
+      overflow: hidden;
+      white-space: normal;
+      display: -webkit-box;
+      display: box;
+      -webkit-box-orient: vertical;
+      box-orient: vertical;
+      -webkit-line-clamp: 2;
+      line-clamp: 2;
+      line-height: 1.2;
+    }
+  }
+
+  &:hover figure figcaption {
+    color: var(--text-color);
+  }
 }
 .status .media-container.media-eq1 .media {
   display: inline-block;