diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Assets/scss/dashboard.scss b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Assets/scss/dashboard.scss
index 8581aeebad8..cfe7331aa09 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Assets/scss/dashboard.scss
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Assets/scss/dashboard.scss
@@ -68,44 +68,23 @@
 
     .dashboard-wrapper.ui-resizable {
         overflow-y: hidden;
+        overflow-x: hidden;
     }
-}
-
-.dashboard-meta {
-    padding-left: 20px;
-    padding-right: 20px;
 
-    &:first-child {
-        padding-top: 12px;
+    .dashboard-wrapper:not(.ui-resizable) {
+        scrollbar-width: thin;
+        overflow-y: auto;
+        overflow-x: hidden;
     }
 }
 
-@include color-mode(light) {
-    & .dashboard-wrapper {
-        & .card {
-            & .card-header {
-                background-color: #fff !important;
-            }
-
-            & .card-footer {
-                background-color: #fff !important;
-            }
-        }
-    }
+.dashboard-body-container {
+    scrollbar-width: thin;
+    overflow-y: auto;
 }
 
-@include color-mode(dark) {
-    & .dashboard-wrapper {
-        & .card {
-            & .card-header {
-                background-color: rgb(24, 26, 27) !important;
-            }
-
-            & .card-footer {
-                background-color: rgb(24, 26, 27) !important;
-            }
-        }
-    }
+.dashboard-meta {
+    padding: 0.5rem !important;
 }
 
 .dashboard-handle {
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard.Wrapper.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard.Wrapper.cshtml
index 9008850d8ef..9db9c875a78 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard.Wrapper.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard.Wrapper.cshtml
@@ -3,11 +3,8 @@
 
 @{
     var dashboardPart = Model.Dashboard.As<DashboardPart>();
-    var position = dashboardPart.Position;
-    var width = dashboardPart.Width;
-    var height = dashboardPart.Height;
-    var contentItemId = Model.Dashboard.ContentItemId; 
 }
-<div style="--dashboard-width: @(width); --dashboard-height:@(height)" class="dashboard-wrapper" id="@(contentItemId)" >
+
+<div style="--dashboard-width: @(dashboardPart.Width); --dashboard-height: @(dashboardPart.Height);" class="dashboard-wrapper rounded" id="@(Model.Dashboard.ContentItemId)">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
index dd71a23dd97..b72dbb632bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
@@ -1,4 +1,4 @@
-<div class="card h-100 @string.Join(" ", Model.Classes.ToArray())">
+<div class="card h-100 @string.Join(' ', Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Leading != null || Model.ActionsMenu != null)
     {
         <div class="card-header">
@@ -17,14 +17,14 @@
             }
         </div>
     }
-    @if (Model.Tags != null || Model.Meta != null)
-    {
-        <div class="dashboard-meta">
-            @await DisplayAsync(Model.Meta)
-            @await DisplayAsync(Model.Tags)
-        </div>
-    }
-    <div class="card-body p-0">
+    <div class="dashboard-body-container card-body p-0 h-100">
+        @if (Model.Tags != null || Model.Meta != null)
+        {
+            <div class="dashboard-meta">
+                @await DisplayAsync(Model.Meta)
+                @await DisplayAsync(Model.Tags)
+            </div>
+        }
         @await DisplayAsync(Model.Content)
     </div>
     @if (Model.Footer != null)
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/TitlePart.DetailAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/TitlePart.DetailAdmin.cshtml
index 004d6d0a4af..03ca971abc6 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/TitlePart.DetailAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/TitlePart.DetailAdmin.cshtml
@@ -1 +1 @@
-<h5 style="display:inline-block">@Model.ContentItem.DisplayText</h5>
+<h5 class="d-inline mb-0">@Model.ContentItem.DisplayText</h5>
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.css b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.css
index 9b47f9fad49..004a0d09554 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.css
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.css
@@ -48,28 +48,21 @@
 }
 .dashboard-container .dashboard-wrapper.ui-resizable {
   overflow-y: hidden;
+  overflow-x: hidden;
 }
-
-.dashboard-meta {
-  padding-left: 20px;
-  padding-right: 20px;
-}
-.dashboard-meta:first-child {
-  padding-top: 12px;
+.dashboard-container .dashboard-wrapper:not(.ui-resizable) {
+  scrollbar-width: thin;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
-[data-bs-theme=light] .dashboard-wrapper .card .card-header {
-  background-color: #fff !important;
-}
-[data-bs-theme=light] .dashboard-wrapper .card .card-footer {
-  background-color: #fff !important;
+.dashboard-body-container {
+  scrollbar-width: thin;
+  overflow-y: auto;
 }
 
-[data-bs-theme=dark] .dashboard-wrapper .card .card-header {
-  background-color: rgb(24, 26, 27) !important;
-}
-[data-bs-theme=dark] .dashboard-wrapper .card .card-footer {
-  background-color: rgb(24, 26, 27) !important;
+.dashboard-meta {
+  padding: 0.5rem !important;
 }
 
 .dashboard-handle {
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.min.css b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.min.css
index 90815b4e2c9..f6f3e269605 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.min.css
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.min.css
@@ -1 +1 @@
-@media (min-width:576px) and (max-width:767.98px){:root{--dashboard-columns:1;--dashboard-columns-default:1}}@media (min-width:768px) and (max-width:991.98px){:root{--dashboard-columns:2;--dashboard-columns-default:2}}@media (min-width:992px) and (max-width:1199.98px){:root{--dashboard-columns:3;--dashboard-columns-default:3}}@media (min-width:1200px) and (max-width:1399.98px){:root{--dashboard-columns:4;--dashboard-columns-default:4}}@media (min-width:1400px){:root{--dashboard-columns:6;--dashboard-columns-default:6}}.dashboard-container{display:grid;grid-template-columns:repeat(var(--dashboard-columns),1fr);grid-template-rows:repeat(6,240px);grid-gap:1rem}.dashboard-container .dashboard-wrapper{grid-column:span var(--dashboard-width);overflow-x:hidden;grid-row:span var(--dashboard-height);overflow-y:auto}.dashboard-container .dashboard-wrapper .card .card-header{border-bottom:none!important}.dashboard-container .dashboard-wrapper .card .card-footer{border-top:none!important}.dashboard-container .dashboard-wrapper.ui-resizable{overflow-y:hidden}.dashboard-meta{padding-left:20px;padding-right:20px}.dashboard-meta:first-child{padding-top:12px}[data-bs-theme=light] .dashboard-wrapper .card .card-header{background-color:#fff!important}[data-bs-theme=light] .dashboard-wrapper .card .card-footer{background-color:#fff!important}[data-bs-theme=dark] .dashboard-wrapper .card .card-header{background-color:#181a1b!important}[data-bs-theme=dark] .dashboard-wrapper .card .card-footer{background-color:#181a1b!important}.dashboard-handle{display:inline-block;margin-right:.5rem}.dashboard-handle:hover{cursor:move}.dashboard-dragdrop-placeholder{margin-top:6px;margin-bottom:6px;min-height:6px;display:inline-block;border:1px dashed orange;grid-column:span var(--dashboard-width);overflow-x:hidden;grid-row:span var(--dashboard-height);overflow-y:hidden}.ui-resizable-helper{border:1px dashed orange}
+@media (min-width:576px) and (max-width:767.98px){:root{--dashboard-columns:1;--dashboard-columns-default:1}}@media (min-width:768px) and (max-width:991.98px){:root{--dashboard-columns:2;--dashboard-columns-default:2}}@media (min-width:992px) and (max-width:1199.98px){:root{--dashboard-columns:3;--dashboard-columns-default:3}}@media (min-width:1200px) and (max-width:1399.98px){:root{--dashboard-columns:4;--dashboard-columns-default:4}}@media (min-width:1400px){:root{--dashboard-columns:6;--dashboard-columns-default:6}}.dashboard-container{display:grid;grid-template-columns:repeat(var(--dashboard-columns),1fr);grid-template-rows:repeat(6,240px);grid-gap:1rem}.dashboard-container .dashboard-wrapper{grid-column:span var(--dashboard-width);overflow-x:hidden;grid-row:span var(--dashboard-height);overflow-y:auto}.dashboard-container .dashboard-wrapper .card .card-header{border-bottom:none!important}.dashboard-container .dashboard-wrapper .card .card-footer{border-top:none!important}.dashboard-container .dashboard-wrapper.ui-resizable{overflow-y:hidden;overflow-x:hidden}.dashboard-container .dashboard-wrapper:not(.ui-resizable){scrollbar-width:thin;overflow-y:auto;overflow-x:hidden}.dashboard-body-container{scrollbar-width:thin;overflow-y:auto}.dashboard-meta{padding:.5rem!important}.dashboard-handle{display:inline-block;margin-right:.5rem}.dashboard-handle:hover{cursor:move}.dashboard-dragdrop-placeholder{margin-top:6px;margin-bottom:6px;min-height:6px;display:inline-block;border:1px dashed orange;grid-column:span var(--dashboard-width);overflow-x:hidden;grid-row:span var(--dashboard-height);overflow-y:hidden}.ui-resizable-helper{border:1px dashed orange}