diff --git a/web/app/controllers/problem_list.php b/web/app/controllers/problem_list.php
index 3b92538..a6a7cef 100644
--- a/web/app/controllers/problem_list.php
+++ b/web/app/controllers/problem_list.php
@@ -114,7 +114,7 @@ EOD;
 	$pag = new Paginator($pag_config);
 
 	$div_classes = isset($REQUIRE_LIB['bootstrap5'])
-		? array('card', 'my-3', 'overflow-auto')
+		? array('card', 'my-3', 'table-responsive')
 		: array('table-responsive');
 	$table_classes = isset($REQUIRE_LIB['bootstrap5'])
 		? array('table', 'uoj-table', 'mb-0')
diff --git a/web/app/controllers/problem_set.php b/web/app/controllers/problem_set.php
index 5772de0..8ea93c3 100644
--- a/web/app/controllers/problem_set.php
+++ b/web/app/controllers/problem_set.php
@@ -163,7 +163,7 @@ EOD;
 	$pag = new Paginator($pag_config);
 
 	$div_classes = isset($REQUIRE_LIB['bootstrap5'])
-		? array('card', 'my-3', 'overflow-auto')
+		? array('card', 'my-3', 'table-responsive')
 		: array('table-responsive');
 	$table_classes = isset($REQUIRE_LIB['bootstrap5'])
 		? array('table', 'uoj-table', 'mb-0')
diff --git a/web/app/libs/uoj-html-lib.php b/web/app/libs/uoj-html-lib.php
index bb1fb7e..d8b63ea 100644
--- a/web/app/libs/uoj-html-lib.php
+++ b/web/app/libs/uoj-html-lib.php
@@ -374,7 +374,7 @@ function echoSubmissionsListOnlyOne($submission, $config, $user) {
 	global $REQUIRE_LIB;
 
 	if (isset($REQUIRE_LIB['bootstrap5'])) {
-		echo '<div class="card mb-3">';
+		echo '<div class="card mb-3 table-responsive">';
 		echo '<table class="table text-center uoj-table mb-0">';
 	} else {
 		echo '<div class="table-responsive">';
@@ -1202,7 +1202,7 @@ function echoHackListOnlyOne($hack, $config, $user) {
 	global $REQUIRE_LIB;
 	
 	if (isset($REQUIRE_LIB['bootstrap5'])) {
-		echo '<div class="card mb-3">';
+		echo '<div class="card mb-3 table-responsive">';
 		echo '<table class="table text-center uoj-table mb-0">';
 	} else {
 		echo '<div class="table-responsive">';
diff --git a/web/app/views/contest-dashboard.php b/web/app/views/contest-dashboard.php
index f09f462..3b014c8 100644
--- a/web/app/views/contest-dashboard.php
+++ b/web/app/views/contest-dashboard.php
@@ -1,5 +1,5 @@
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
-<div class="card card-default mb-3">
+<div class="card card-default table-responsive mb-3">
 	<table class="table uoj-table text-center mb-0">
 <?php else: ?>
 <div class="table-responsive">
@@ -28,7 +28,7 @@
 
 <h3><?= UOJLocale::get('contests::contest notice') ?></h3>
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
-<div class="card card-default mb-3">
+<div class="card card-default table-responsive mb-3">
 	<table class="table uoj-table text-center mb-0">
 <?php else: ?>
 <div class="table-responsive">
diff --git a/web/app/views/contest-question-table.php b/web/app/views/contest-question-table.php
index fb626dd..0ae9000 100644
--- a/web/app/views/contest-question-table.php
+++ b/web/app/views/contest-question-table.php
@@ -7,7 +7,7 @@ if (!isset($can_reply)) {
 
 ?>
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
-<div class="card card-default mb-3">
+<div class="card card-default table-responsive mb-3">
 	<table class="table uoj-table text-center mb-0">
 <?php else: ?>
 <div class="table-responsive">