diff --git a/frontend/pages/index.client.vue b/frontend/pages/index.client.vue
index 8fe7920..2be9d18 100644
--- a/frontend/pages/index.client.vue
+++ b/frontend/pages/index.client.vue
@@ -372,7 +372,8 @@ onBeforeUnmount(() => {
       </template>
     </UDashboardNavbar>
 
-    <div v-if="visibleWidgets.length > 0" ref="gridElement" class="grid-stack dashboard-grid overflow-y-auto h-80">
+    <UDashboardPanelContent>
+    <div v-if="visibleWidgets.length > 0" ref="gridElement" class="grid-stack dashboard-grid">
       <div
           v-for="widget in visibleWidgets"
           :key="widget.id"
@@ -430,7 +431,7 @@ onBeforeUnmount(() => {
       </div>
     </div>
 
-    <div class="rounded-xl border border-dashed border-gray-300 dark:border-gray-700 p-10 text-center">
+    <div v-else class="rounded-xl border border-dashed border-gray-300 dark:border-gray-700 p-10 text-center">
       <p class="text-sm">
         Es sind aktuell keine Dashboard-Karten sichtbar.
       </p>
@@ -438,6 +439,7 @@ onBeforeUnmount(() => {
         Karte hinzufügen
       </UButton>
     </div>
+    </UDashboardPanelContent>
 
     <UModal v-model="manageCardsOpen">
       <UCard>