diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js b/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js
index 5d793293..389968bc 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js
@@ -5,7 +5,7 @@ export default {
     height: 36
   },
   tBody: {
-    maxHeight: '65vh',
+    maxHeight: 'calc(100vh - 350px)',
     overflow: 'auto'
   },
   tableWidth: {
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
index ea74c24b..86b8f4db 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
@@ -51,6 +51,12 @@ const styles = {
     display: 'flex',
     flexDirection: 'row',
     justifyContent: 'space-between'
+  },
+  tableWrapper: {
+    display: 'flex',
+    flexDirection: 'column',
+    flex: 1,
+    marginBottom: 80
   }
 }
 
@@ -243,13 +249,15 @@ const CashboxHistory = ({ machines, currency, timezone }) => {
   ]
 
   return (
-    <DataTable
-      loading={loading}
-      name="cashboxHistory"
-      elements={elements}
-      data={batches}
-      emptyText="No cash box batches so far"
-    />
+    <div className={classes.tableWrapper}>
+      <DataTable
+        loading={loading}
+        name="cashboxHistory"
+        elements={elements}
+        data={batches}
+        emptyText="No cash box batches so far"
+      />
+    </div>
   )
 }