diff --git a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt
index c2f4a5e..400204a 100644
--- a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt
+++ b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt
@@ -41,7 +41,6 @@ class ListDetailViewModel(
                 .debounce(75)
                 .collect { listWithFields ->
                 _list.value = listWithFields?.list
-                _fields.value = listWithFields?.fields ?: emptyList()
             }
         }
         
@@ -50,6 +49,14 @@ class ListDetailViewModel(
                 _items.value = itemsData
             }
         }
+
+        viewModelScope.launch {
+            database.fieldDao().getFieldsForList(listId)
+                .debounce(75)
+                .collect { fieldsData ->
+                    _fields.value = fieldsData
+                }
+        }
     }
     
     private fun startPeriodicSync() {
diff --git a/CollabTableAndroid/build-output.txt b/CollabTableAndroid/build-output.txt
index 81dfa0f..8a11f4b 100644
Binary files a/CollabTableAndroid/build-output.txt and b/CollabTableAndroid/build-output.txt differ