diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.js
index 06687b19a..366ee14d2 100644
--- a/ui/src/album/AlbumGridView.js
+++ b/ui/src/album/AlbumGridView.js
@@ -13,10 +13,6 @@ const useStyles = makeStyles((theme) => ({
   root: {
     margin: '20px',
   },
-  gridListTile: {
-    minHeight: '180px',
-    minWidth: '180px',
-  },
   tileBar: {
     textAlign: 'left',
     background:
@@ -44,8 +40,9 @@ const useCoverStyles = makeStyles({
 
 const getColsForWidth = (width) => {
   if (width === 'xs') return 2
-  if (width === 'sm') return 4
-  if (width === 'md') return 5
+  if (width === 'sm') return 3
+  if (width === 'md') return 4
+  if (width === 'lg') return 6
   return 6
 }
 
diff --git a/ui/src/album/AlbumList.js b/ui/src/album/AlbumList.js
index 7a9c56b0f..2ec206c58 100644
--- a/ui/src/album/AlbumList.js
+++ b/ui/src/album/AlbumList.js
@@ -50,9 +50,8 @@ const getPerPageOptions = (width) => {
   const options = [3, 6, 12]
   if (width === 'xs') return [12]
   if (width === 'sm') return [12]
-  if (width === 'md') return options.map((v) => v * 5)
-  if (width === 'lg') return options.map((v) => v * 6)
-  return options.map((v) => v * 7)
+  if (width === 'md') return options.map((v) => v * 4)
+  return options.map((v) => v * 6)
 }
 
 const AlbumList = (props) => {