diff --git a/components/embed.js b/components/embed.js
index 1558f4f5..b336fc81 100644
--- a/components/embed.js
+++ b/components/embed.js
@@ -125,19 +125,21 @@ const Embed = memo(function Embed ({ src, provider, id, meta, className, topLeve
   // This Twitter embed could use similar logic to the video embeds below
   if (provider === 'twitter') {
     return (
-      <div className={classNames(styles.twitterContainer, !show && styles.twitterContained, className)}>
-        <TwitterTweetEmbed
-          tweetId={id}
-          options={{ theme: darkMode ? 'dark' : 'light', width: topLevel ? '550px' : '350px' }}
-          key={darkMode ? '1' : '2'}
-          placeholder={<TweetSkeleton className={className} />}
-          onLoad={() => setOverflowing(true)}
-        />
-        {overflowing && !show &&
-          <Button size='lg' variant='info' className={styles.twitterShowFull} onClick={() => setShow(true)}>
-            show full tweet
-          </Button>}
-      </div>
+      <>
+        <div className={classNames(styles.twitterContainer, !show && styles.twitterContained, className)}>
+          <TwitterTweetEmbed
+            tweetId={id}
+            options={{ theme: darkMode ? 'dark' : 'light', width: topLevel ? '550px' : '350px' }}
+            key={darkMode ? '1' : '2'}
+            placeholder={<TweetSkeleton className={className} />}
+            onLoad={() => setOverflowing(true)}
+          />
+          {overflowing && !show &&
+            <Button size='lg' variant='info' className={styles.twitterShowFull} onClick={() => setShow(true)}>
+              show full tweet
+            </Button>}
+        </div>
+      </>
     )
   }
 
diff --git a/components/text.js b/components/text.js
index 48a17a3c..654fa3ca 100644
--- a/components/text.js
+++ b/components/text.js
@@ -138,7 +138,7 @@ export default memo(function Text ({ rel = UNKNOWN_LINK_REL, imgproxyUrls, child
       return <Link id={props.id} target='_blank' rel={rel} href={href}>{children}</Link>
     },
     img: TextMediaOrLink,
-    embed: Embed
+    embed: (props) => <Embed {...props} topLevel={topLevel} />
   }), [outlawed, rel, TextMediaOrLink, topLevel])
 
   const carousel = useCarousel()
diff --git a/components/text.module.css b/components/text.module.css
index 9e6efb97..fe0b43e4 100644
--- a/components/text.module.css
+++ b/components/text.module.css
@@ -252,11 +252,18 @@
     margin-top: .25rem;
 }
 
+.text li > :is(.twitterContainer, .nostrContainer, .wavlakeWrapper, .spotifyWrapper, .onlyImages) {
+  display: inline-flex;
+  vertical-align: top;
+  width: 100%;
+}
+
 .text ul,
 .text ol {
   margin-top: 0;
   margin-bottom: 0rem;
   padding-left: 2rem;
+  max-width: calc(100% - 1rem);
 }
 
 .text ol ol,