diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index a33501b4..34b77a0b 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -612,6 +612,8 @@
                 "autoFitColumns": "auto fit columns",
                 "displayType": "display type",
                 "gap": "$t(common.gap)",
+                "itemGap": "item gap (px)",
+                "itemSize": "item size (px)",
                 "size": "$t(common.size)",
                 "tableColumns": "table columns"
             },
diff --git a/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx b/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
index ecb05bde..e313d942 100644
--- a/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
+++ b/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
@@ -72,7 +72,7 @@ export const VirtualInfiniteGrid = forwardRef(
         const [itemData, setItemData] = useState<any[]>(fetchInitialData?.() || []);
 
         const { itemHeight, rowCount, columnCount } = useMemo(() => {
-            const itemsPerRow = width ? Math.floor(width / itemSize) : 5;
+            const itemsPerRow = width ? Math.floor(width / (itemSize + itemGap * 2)) : 5;
             const widthPerItem = Number(width) / itemsPerRow;
             const itemHeight = widthPerItem + cardRows.length * 26;
 
@@ -81,7 +81,7 @@ export const VirtualInfiniteGrid = forwardRef(
                 itemHeight,
                 rowCount: Math.ceil(itemCount / itemsPerRow),
             };
-        }, [cardRows.length, itemCount, itemSize, width]);
+        }, [cardRows.length, itemCount, itemGap, itemSize, width]);
 
         const isItemLoaded = useCallback(
             (index: number) => {
diff --git a/src/renderer/features/albums/components/album-list-header-filters.tsx b/src/renderer/features/albums/components/album-list-header-filters.tsx
index ffe54b42..c1710f65 100644
--- a/src/renderer/features/albums/components/album-list-header-filters.tsx
+++ b/src/renderer/features/albums/components/album-list-header-filters.tsx
@@ -538,7 +538,9 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                             Table (paginated)
                         </DropdownMenu.Item> */}
                         <DropdownMenu.Divider />
-                        <DropdownMenu.Label>Item size</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.itemSize', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                         <DropdownMenu.Item closeMenuOnClick={false}>
                             <Slider
                                 defaultValue={isGrid ? grid?.itemSize || 0 : table.rowHeight}
@@ -549,7 +551,11 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                         </DropdownMenu.Item>
                         {isGrid && (
                             <>
-                                <DropdownMenu.Label>Item gap</DropdownMenu.Label>
+                                <DropdownMenu.Label>
+                                    {t('table.config.general.itemGap', {
+                                        postProcess: 'sentenceCase',
+                                    })}
+                                </DropdownMenu.Label>
                                 <DropdownMenu.Item closeMenuOnClick={false}>
                                     <Slider
                                         defaultValue={grid?.itemGap || 0}
diff --git a/src/renderer/features/artists/components/album-artist-list-header-filters.tsx b/src/renderer/features/artists/components/album-artist-list-header-filters.tsx
index 5d93d862..9bac50bb 100644
--- a/src/renderer/features/artists/components/album-artist-list-header-filters.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-header-filters.tsx
@@ -472,7 +472,9 @@ export const AlbumArtistListHeaderFilters = ({
                             Table (paginated)
                         </DropdownMenu.Item> */}
                         <DropdownMenu.Divider />
-                        <DropdownMenu.Label>Item size</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.itemSize', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                         <DropdownMenu.Item closeMenuOnClick={false}>
                             {display === ListDisplayType.CARD ||
                             display === ListDisplayType.POSTER ? (
@@ -493,7 +495,11 @@ export const AlbumArtistListHeaderFilters = ({
                         </DropdownMenu.Item>
                         {isGrid && (
                             <>
-                                <DropdownMenu.Label>Item gap</DropdownMenu.Label>
+                                <DropdownMenu.Label>
+                                    {t('table.config.general.itemGap', {
+                                        postProcess: 'sentenceCase',
+                                    })}
+                                </DropdownMenu.Label>
                                 <DropdownMenu.Item closeMenuOnClick={false}>
                                     <Slider
                                         defaultValue={grid?.itemGap || 0}
diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
index 83d4311a..5da52b78 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
@@ -523,7 +523,9 @@ export const PlaylistDetailSongListHeaderFilters = ({
                             Table (paginated)
                         </DropdownMenu.Item> */}
                         <DropdownMenu.Divider />
-                        <DropdownMenu.Label>Item size</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.itemSize', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                         <DropdownMenu.Item closeMenuOnClick={false}>
                             <Slider
                                 defaultValue={page.table.rowHeight}
diff --git a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
index cb0c51c3..c101436c 100644
--- a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
@@ -399,7 +399,9 @@ export const PlaylistListHeaderFilters = ({
                             Table (paginated)
                         </DropdownMenu.Item> */}
                         <DropdownMenu.Divider />
-                        <DropdownMenu.Label>Item size</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.itemSize', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                         <DropdownMenu.Item closeMenuOnClick={false}>
                             <Slider
                                 defaultValue={isGrid ? grid?.itemSize || 0 : table.rowHeight}
@@ -407,20 +409,24 @@ export const PlaylistListHeaderFilters = ({
                                 min={isGrid ? 150 : 25}
                                 onChangeEnd={handleItemSize}
                             />
-                            {isGrid && (
-                                <>
-                                    <DropdownMenu.Label>Item gap</DropdownMenu.Label>
-                                    <DropdownMenu.Item closeMenuOnClick={false}>
-                                        <Slider
-                                            defaultValue={grid?.itemGap || 0}
-                                            max={30}
-                                            min={0}
-                                            onChangeEnd={handleItemGap}
-                                        />
-                                    </DropdownMenu.Item>
-                                </>
-                            )}
                         </DropdownMenu.Item>
+                        {isGrid && (
+                            <>
+                                <DropdownMenu.Label>
+                                    {t('table.config.general.itemGap', {
+                                        postProcess: 'sentenceCase',
+                                    })}
+                                </DropdownMenu.Label>
+                                <DropdownMenu.Item closeMenuOnClick={false}>
+                                    <Slider
+                                        defaultValue={grid?.itemGap || 0}
+                                        max={30}
+                                        min={0}
+                                        onChangeEnd={handleItemGap}
+                                    />
+                                </DropdownMenu.Item>
+                            </>
+                        )}
                         {!isGrid && (
                             <>
                                 <DropdownMenu.Label>