diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index 01651ebc4..683ade739 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -204,6 +204,7 @@ const styles = (theme: Theme) =>
     menuSmall: {
       background: theme.palette.background.paper,
       height: "100vh",
+      overflow: "hidden",
       padding: 25
     },
     popover: {
diff --git a/src/components/TableHead/TableHead.tsx b/src/components/TableHead/TableHead.tsx
index 0ee28e0ec..bc36b2fa5 100644
--- a/src/components/TableHead/TableHead.tsx
+++ b/src/components/TableHead/TableHead.tsx
@@ -101,26 +101,25 @@ const TableHead = withStyles(styles, {
               })}
             />
           )}
-          {(items === undefined || items.length > 0) &&
-            (selected && (
-              <TableCell
-                padding="checkbox"
+          {(items === undefined || items.length > 0) && (
+            <TableCell
+              padding="checkbox"
+              className={classNames({
+                [classes.checkboxSelected]: selected,
+                [classes.dragRows]: dragRows
+              })}
+            >
+              <Checkbox
                 className={classNames({
-                  [classes.checkboxSelected]: selected,
-                  [classes.dragRows]: dragRows
+                  [classes.checkboxPartialSelect]:
+                    items && items.length > selected && selected > 0
                 })}
-              >
-                <Checkbox
-                  className={classNames({
-                    [classes.checkboxPartialSelect]:
-                      items && items.length > selected && selected > 0
-                  })}
-                  checked={selected === 0 ? false : true}
-                  disabled={disabled}
-                  onChange={() => toggleAll(items, selected)}
-                />
-              </TableCell>
-            ))}
+                checked={selected === 0 ? false : true}
+                disabled={disabled}
+                onChange={() => toggleAll(items, selected)}
+              />
+            </TableCell>
+          )}
           {selected ? (
             <>
               <TableCell