diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Shared/Table.razor
index 406eae98..8b2be987 100644
--- a/src/admin/Bootstrap.Admin/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Table.razor
@@ -12,7 +12,7 @@
         </TableToolbar>
     </div>
 
-    <div class="table-wrapper">
+    <div class="@(FixedHeader ? "table-wrapper table-fixed-header" : "table-wrapper")">
         @if(FixedHeader)
         {
             <div class="fixed-table-header">
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index 11090234..a91f7526 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -135,8 +135,6 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     }
 
     .bootstrap-table .fixed-table-body {
-        overflow: auto;
-        border-radius: 4px;
         height: 300px;
     }
 
@@ -150,7 +148,6 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
 
 .table-wrapper {
     border-radius: 4px;
-    overflow: auto;
     margin-bottom: 1rem;
 }
 
@@ -158,6 +155,22 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
         margin-bottom: 0;
     }
 
+.table-fixed-header {
+    border: solid 1px #dee2e6;
+}
+
+    .table-fixed-header .table {
+        border: none;
+    }
+
+        .table-fixed-header .table th:last-child {
+            border-right-width: 0;
+        }
+
+        .table-fixed-header .table th:first-child, .table-fixed-header .table td:first-child {
+            border-left-width: 0;
+        }
+
 .pagination-bar {
     flex: 1 1 auto;
     margin-bottom: 1rem;