diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt b/src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt
index 1b54075f..ce7ae63d 100644
--- a/src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt
@@ -1,15 +1,18 @@
 package com.looker.droidify.ui.compose
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
@@ -77,8 +80,13 @@ fun <T> VerticalItemList(
     itemKey: ((T) -> Any)? = null,
     itemContent: @Composable LazyItemScope.(T) -> Unit
 ) {
-    Surface(modifier = modifier, color = backgroundColor) {
-        if (list != null) {
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .background(backgroundColor),
+        contentAlignment = Alignment.Center
+    ) {
+        if (!list.isNullOrEmpty()) {
             LazyColumn(verticalArrangement = spacedBy(4.dp)) {
                 items(items = list, key = itemKey, itemContent = itemContent)
             }