diff --git a/lib/feature/earthquake_history_details/component/prefecture_intensity.dart b/lib/feature/earthquake_history_details/component/prefecture_intensity.dart
index d5070d737..11a57cdf6 100644
--- a/lib/feature/earthquake_history_details/component/prefecture_intensity.dart
+++ b/lib/feature/earthquake_history_details/component/prefecture_intensity.dart
@@ -103,15 +103,15 @@ class PrefectureIntensityWidget extends HookConsumerWidget {
                   subtitle: Text(
                     kv.value.map((e) => e.prefecture.name).join(', '),
                   ),
-                  onTap: kv.value.isEmpty
-                      ? null
-                      : () => _PrefectureModalBottomSheet.show(
+                  onTap: hasChildren
+                      ? () => _PrefectureModalBottomSheet.show(
                             context: context,
                             intensity: kv.key,
                             prefectures: kv.value,
-                          ),
+                          )
+                      : null,
                   trailing:
-                      hasChildren ? null : const Icon(Icons.chevron_right),
+                      hasChildren ? const Icon(Icons.chevron_right) : null,
                 );
               }(),
           ],
diff --git a/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart b/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart
index e54b8520c..ce8af13ab 100644
--- a/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart
+++ b/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart
@@ -418,6 +418,7 @@ class _EarthquakeHypoInfoWidget extends ConsumerWidget {
             color: textTheme.titleMedium!.color!.withOpacity(0.8),
           ),
         ),
+        const SizedBox(width: 4),
         Text(
           item.telegrams.any((element) => element.type == TelegramType.vxse53)
               ? '不明'
@@ -498,7 +499,7 @@ class _EarthquakeCommentWidget extends StatelessWidget {
       return BorderedContainer(
         padding: const EdgeInsets.all(8),
         elevation: 1,
-        child: MarkdownBody(
+        child: Markdown(
           data: switch ((comment.forecast?.text, comment.free)) {
             (final String text, final String free) => '$text\n\n$free',
             (final String text, _) => text,
@@ -508,6 +509,9 @@ class _EarthquakeCommentWidget extends StatelessWidget {
               .toHalfWidth,
           selectable: true,
           softLineBreak: true,
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          padding: EdgeInsets.zero,
           onTapLink: (text, href, title) async {
             final uri = Uri.tryParse(href.toString());
             if (uri == null) {