diff --git a/ui/component/comment/view.jsx b/ui/component/comment/view.jsx
index 0946436cd..879384bd3 100644
--- a/ui/component/comment/view.jsx
+++ b/ui/component/comment/view.jsx
@@ -26,7 +26,7 @@ import React, { useEffect, useState } from 'react';
 import { parseURI } from 'util/lbryURI';
 import DateTime from 'component/dateTime';
 import Button from 'component/button';
-import Expandable from 'component/expandable';
+import Expandable from 'component/common/expandable';
 import MarkdownPreview from 'component/common/markdown-preview';
 import CommentBadge from 'component/common/comment-badge';
 import ChannelThumbnail from 'component/channelThumbnail';
@@ -88,8 +88,6 @@ type Props = {
   threadDepthLevel?: number,
 };
 
-const LENGTH_TO_COLLAPSE = 300;
-
 function CommentView(props: Props) {
   const {
     comment,
@@ -176,7 +174,6 @@ function CommentView(props: Props) {
   const contentChannelClaim = getChannelFromClaim(claim);
   const commentByOwnerOfContent = contentChannelClaim && contentChannelClaim.permanent_url === authorUri;
   const stickerFromMessage = parseSticker(message);
-  const isExpandable = editedMessage.length >= LENGTH_TO_COLLAPSE;
 
   let channelOwnerOfContent;
   try {
@@ -388,8 +385,8 @@ function CommentView(props: Props) {
                     <div className="sticker__comment">
                       <OptimizedImage src={stickerFromMessage.url} waitLoad loading="lazy" />
                     </div>
-                  ) : isExpandable ? (
-                    <Expandable beginCollapsed>
+                  ) : (
+                    <Expandable>
                       <MarkdownPreview
                         content={message}
                         promptLinks
@@ -398,14 +395,6 @@ function CommentView(props: Props) {
                         hasMembership={Boolean(commenterMembership)}
                       />
                     </Expandable>
-                  ) : (
-                    <MarkdownPreview
-                      content={message}
-                      promptLinks
-                      parentCommentId={commentId}
-                      stakedLevel={stakedLevel}
-                      hasMembership={Boolean(commenterMembership)}
-                    />
                   )}
                 </div>
 
diff --git a/ui/component/common/expandable.jsx b/ui/component/common/expandable.jsx
new file mode 100644
index 000000000..5baf84f0c
--- /dev/null
+++ b/ui/component/common/expandable.jsx
@@ -0,0 +1,70 @@
+// @flow
+import React from 'react';
+import classnames from 'classnames';
+import Button from 'component/button';
+import { useOnResize } from 'effects/use-on-resize';
+
+const COLLAPSED_HEIGHT = 120;
+
+type Props = {
+  children: React$Node | Array<React$Node>,
+};
+
+export default function Expandable(props: Props) {
+  const { children } = props;
+
+  const ref = React.useRef();
+
+  const [expanded, setExpanded] = React.useState(false);
+  const [childRect, setRect] = React.useState();
+
+  const childOverflows = childRect && childRect.height > COLLAPSED_HEIGHT;
+
+  function handleClick() {
+    setExpanded(!expanded);
+  }
+
+  // Update the rect when children changes,
+  // this is needed when there is an image or claim embed
+  // to be loaded ! :D
+  React.useLayoutEffect(() => {
+    if (ref.current) {
+      const childElem = ref.current.children[0];
+      setRect(childElem.getBoundingClientRect());
+    }
+  }, [children]);
+
+  const expandableRef = React.useCallback((node) => {
+    if (node) {
+      const childElem = node.children[0];
+      setRect(childElem.getBoundingClientRect());
+      ref.current = node;
+    }
+  }, []);
+
+  // Update the childRect initially & when the window size changes.
+  useOnResize(() => expandableRef(ref.current));
+
+  return (
+    <>
+      <div
+        className={classnames('expandable', {
+          'expandable--open': expanded,
+          'expandable--closed-fade': !expanded && childOverflows,
+        })}
+        ref={expandableRef}
+      >
+        {children}
+      </div>
+
+      {childOverflows && (
+        <Button
+          button="link"
+          className="expandable__button"
+          label={expanded ? __('Less') : __('More')}
+          onClick={handleClick}
+        />
+      )}
+    </>
+  );
+}
diff --git a/ui/component/expandable/index.js b/ui/component/expandable/index.js
deleted file mode 100644
index 0614faa5b..000000000
--- a/ui/component/expandable/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Expandable from './view';
-
-export default Expandable;
diff --git a/ui/component/expandable/view.jsx b/ui/component/expandable/view.jsx
deleted file mode 100644
index 6c1b817d3..000000000
--- a/ui/component/expandable/view.jsx
+++ /dev/null
@@ -1,67 +0,0 @@
-// @flow
-import React, { useRef, useState } from 'react';
-import classnames from 'classnames';
-import Button from 'component/button';
-import { useOnResize } from 'effects/use-on-resize';
-
-const COLLAPSED_HEIGHT = 120;
-
-type Props = {
-  children: React$Node | Array<React$Node>,
-  beginCollapsed?: boolean,
-};
-
-export default function Expandable(props: Props) {
-  const { children, beginCollapsed } = props;
-
-  const [expanded, setExpanded] = useState(false);
-  const [rect, setRect] = useState();
-  const ref = useRef();
-
-  // Update the rect initially & when the window size changes.
-  useOnResize(() => {
-    if (ref.current) {
-      setRect(ref.current.getBoundingClientRect());
-    }
-  });
-
-  // Update the rect when children changes,
-  // not sure if this is needed but a situation could arise when the
-  // component re-renders with a different children prop,
-  // Can enable on a later date if needed.
-  // useLayoutEffect(() => {
-  //   console.log('render, useLayoutEffect');
-  //   if (ref.current) {
-  //     setRect(ref.current.getBoundingClientRect());
-  //   }
-  // }, [children]);
-
-  function handleClick() {
-    setExpanded(!expanded);
-  }
-
-  return (
-    <div ref={ref}>
-      {(rect && rect.height > COLLAPSED_HEIGHT) || beginCollapsed ? (
-        <div ref={ref}>
-          <div
-            className={classnames({
-              'expandable--open': expanded,
-              'expandable--closed': !expanded,
-            })}
-          >
-            {children}
-          </div>
-          <Button
-            button="link"
-            className="expandable__button"
-            label={expanded ? __('Less') : __('More')}
-            onClick={handleClick}
-          />
-        </div>
-      ) : (
-        <div>{children}</div>
-      )}
-    </div>
-  );
-}
diff --git a/ui/effects/use-on-resize.js b/ui/effects/use-on-resize.js
index d7fe612e4..abc1b9f89 100644
--- a/ui/effects/use-on-resize.js
+++ b/ui/effects/use-on-resize.js
@@ -14,5 +14,6 @@ export function useOnResize(cb) {
 
       return () => window.removeEventListener('resize', handleResize);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isWindowClient]);
 }
diff --git a/ui/scss/component/_expandable.scss b/ui/scss/component/_expandable.scss
index b61c5178e..c19fa024b 100644
--- a/ui/scss/component/_expandable.scss
+++ b/ui/scss/component/_expandable.scss
@@ -1,14 +1,17 @@
 $COLLAPSED_HEIGHT: 120px;
 
+.expandable {
+  max-height: 120px;
+  position: relative;
+  overflow-y: hidden;
+}
+
 .expandable--closed,
 .expandable--open {
   margin-bottom: var(--spacing-s);
 }
 
-.expandable--closed {
-  max-height: calc(#{$COLLAPSED_HEIGHT} * 3 / 4);
-  overflow-y: hidden;
-  position: relative;
+.expandable--closed-fade {
   -webkit-mask-image: -webkit-gradient(linear, left 30%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
 }