diff --git a/app/Http/Controllers/StatusEditController.php b/app/Http/Controllers/StatusEditController.php
index 1d0a22396..1f60e46bf 100644
--- a/app/Http/Controllers/StatusEditController.php
+++ b/app/Http/Controllers/StatusEditController.php
@@ -44,8 +44,9 @@ class StatusEditController extends Controller
     	$cached = StatusService::get($status->id, false);
 
     	$res = $status->edits->map(function($edit) use($cached) {
+    		$caption = nl2br(strip_tags(str_replace('</p>', "\n", $edit->caption)));
     		return [
-    			'content' => Autolink::create()->autolink($edit->caption),
+    			'content' => Autolink::create()->autolink($caption),
     			'spoiler_text' => $edit->spoiler_text,
     			'sensitive' => (bool) $edit->is_nsfw,
     			'created_at' => str_replace('+00:00', 'Z', $edit->created_at->format(DATE_RFC3339_EXTENDED)),
diff --git a/resources/assets/components/partials/post/EditHistoryModal.vue b/resources/assets/components/partials/post/EditHistoryModal.vue
index 67cf89e0a..9dc7c140b 100644
--- a/resources/assets/components/partials/post/EditHistoryModal.vue
+++ b/resources/assets/components/partials/post/EditHistoryModal.vue
@@ -121,7 +121,9 @@
 							</div>
 						</div>
 					</template>
-					<p class="lead my-4" v-html="allHistory[historyIndex].content"></p>
+					<div class="w-100 my-4 px-4 text-break justify-content-start">
+						<p class="mb-0" v-html="allHistory[historyIndex].content"></p>
+					</div>
 				</div>
 			</template>