diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js
index e3e1bda..3f330c0 100644
--- a/src/components/ItemTable/ItemTable.js
+++ b/src/components/ItemTable/ItemTable.js
@@ -21,6 +21,9 @@ export default function ItemTable({ data, rowCanBeSelected }) {
         inactiveSortIcon: {
             opacity: 0.2,
         },
+        container: {
+            maxHeight: 500,
+        },
         rowSelected: {
             backgroundColor: theme.palette.type === 'light' ? theme.palette.primary[100] : theme.palette.primary[600],
         },
@@ -71,9 +74,9 @@ export default function ItemTable({ data, rowCanBeSelected }) {
             },
             initialState: {
                 sortBy: [
-                    { id: 'number', desc: false },
-                    { id: 'lastUpdated', desc: false },
-                ]
+                    { id: 'number' },
+                    { id: 'lastUpdated' },
+                ],
             }
         },
         useFilters, useFlexLayout, useSortBy,
@@ -81,8 +84,8 @@ export default function ItemTable({ data, rowCanBeSelected }) {
     const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow, } = tableInstance;
 
     return (
-        <TableContainer component={Paper} >
-            <Table {...getTableProps} aria-label="Table of Queue Items" >
+        <TableContainer className={classes.container}  >
+            <Table stickyHeader {...getTableProps} aria-label="Table of Queue Items" >
                 <TableHead>
                     {headerGroups.map(headerGroup => (
                         <TableRow {...headerGroup.getHeaderGroupProps()}>