diff --git a/client/src/components/Layout.tsx b/client/src/components/Layout.tsx
index fdf5f53..dbc2acc 100644
--- a/client/src/components/Layout.tsx
+++ b/client/src/components/Layout.tsx
@@ -90,7 +90,7 @@ export default function Layout({ children }: LayoutProps) {
         {/* Desktop Sidebar */}
         {!isMobile && <Sidebar />}
         
-        <main className={`flex-1 flex flex-col overflow-hidden ${
+        <main className={`flex-1 flex flex-col ${
           isMobile ? 'ml-0' : sidebarCollapsed ? 'ml-16' : 'ml-64'
         }`}>
           {/* Header with store selector for admin */}
diff --git a/client/src/pages/CustomerOrders.tsx b/client/src/pages/CustomerOrders.tsx
index 55dff83..9381433 100644
--- a/client/src/pages/CustomerOrders.tsx
+++ b/client/src/pages/CustomerOrders.tsx
@@ -674,7 +674,7 @@ export default function CustomerOrders() {
   } = usePagination(sortedOrders, 10);
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="flex-1 overflow-y-auto">
       <div className="p-6 space-y-6">
       {/* Header */}
       <div className="bg-white border-b border-gray-200 p-6 shadow-sm -m-6 mb-6">
diff --git a/client/src/pages/Dashboard.tsx b/client/src/pages/Dashboard.tsx
index fde7efc..50dcea4 100644
--- a/client/src/pages/Dashboard.tsx
+++ b/client/src/pages/Dashboard.tsx
@@ -218,7 +218,7 @@ export default function Dashboard() {
   };
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="flex-1 overflow-y-auto">
       <div className="p-6 space-y-6">
       {/* Header */}
       <div className="flex items-center justify-between">
diff --git a/client/src/pages/Deliveries.tsx b/client/src/pages/Deliveries.tsx
index 5558ebc..8eb73df 100644
--- a/client/src/pages/Deliveries.tsx
+++ b/client/src/pages/Deliveries.tsx
@@ -255,7 +255,7 @@ export default function Deliveries() {
   const canValidate = permissions.canValidate('deliveries');
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="flex-1 overflow-y-auto">
       <div className="p-6 space-y-6">
       {/* Header */}
       <div className="bg-white border-b border-gray-200 p-6 shadow-sm -m-6 mb-6">
diff --git a/client/src/pages/Orders.tsx b/client/src/pages/Orders.tsx
index 913029b..d336410 100644
--- a/client/src/pages/Orders.tsx
+++ b/client/src/pages/Orders.tsx
@@ -226,7 +226,7 @@ export default function Orders() {
   const canDelete = permissions.canDelete('orders');
 
   return (
-    <div className="h-full overflow-y-auto">
+    <div className="flex-1 overflow-y-auto">
       <div className="p-6 space-y-6">
       {/* Header */}
       <div className="bg-white border-b border-gray-200 p-6 shadow-sm -m-6 mb-6">