diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index 256107b80..2c0cc70c7 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -1014,7 +1014,7 @@ func NewTestAttachments() map[string]*gtsmodel.MediaAttachment {
 				},
 			},
 			AccountID:         "01F8MH1H7YV1Z7D2C8K2730QBF",
-			Description:       "This is a track from Nine Inch Nail's \"Ghosts I-V\" album. This is the third track from \"Ghosts II\".",
+			Description:       "This is a track from Nine Inch Nails' \"Ghosts I-V\" album.\n\nThis is the third track from \"Ghosts II\".",
 			ScheduledStatusID: "",
 			Blurhash:          "LZDJO?ayIUof01j[xuayxuayayj[",
 			Processing:        2,
diff --git a/web/source/css/_media-wrapper.css b/web/source/css/_media-wrapper.css
index b8541df4b..856129f17 100644
--- a/web/source/css/_media-wrapper.css
+++ b/web/source/css/_media-wrapper.css
@@ -271,6 +271,10 @@
 	}
 }
 
+/*
+	Style the "open post" link in the top
+	right corner of the photoswipe lightbox.
+*/
 .pswp__button--open-post-link {
 	display: flex;
 	align-items: center;
@@ -283,6 +287,10 @@
 	}
 }
 
+/*
+	Style the plyr video thingy both in
+	and out of the photoswipe lightbox.
+*/
 .plyr--video {
 	flex-direction: column-reverse;
 
@@ -367,3 +375,27 @@
 		display: flex;
 	}
 }
+
+/*
+	Preserve whitespace in
+	photoswipe captions.
+*/
+.pswp__dynamic-caption {
+  white-space: pre-wrap;
+}
+
+.pswp__dynamic-caption--aside {
+	/*
+		Remove unnecessary padding
+		in "normal" width when caption
+		is rendered on the right side.
+	*/
+	padding: 0;
+
+	/*
+		Let it have a bit more width if it
+		wants, to increase the chance of user
+		being able to see the whole caption.
+	*/
+	max-width: 30rem;
+}