diff --git a/ui/src/services/files/components/tailwind/FilePicker.scala b/ui/src/services/files/components/tailwind/FilePicker.scala
index 2e8f690..0dabf8d 100644
--- a/ui/src/services/files/components/tailwind/FilePicker.scala
+++ b/ui/src/services/files/components/tailwind/FilePicker.scala
@@ -9,11 +9,10 @@
   sealed trait DoneEvent extends Event
   case class SelectionUpdated(files: Set[File]) extends DoneEvent
   case object SelectionCancelled extends DoneEvent
-  case object AvailableFilesRequested extends Event
 
   def apply(
       currentFiles: Signal[List[File]],
-      availableFilesStream: EventStream[List[File]]
+      availableFiles: Signal[List[File]]
   )(selectionUpdates: Observer[Event]): HtmlElement =
     val (updatesStream, updatesObserver) = EventStream.withObserver[Event]
     val selectorOpen = Var[Boolean](false)
@@ -53,7 +52,7 @@
           overlay,
           browserCenteringModalTrick,
           child <-- currentFiles.map(
-            FileSelector(_, availableFilesStream)(updatesObserver)
+            FileSelector(_, availableFiles)(updatesObserver)
           )
         )
       )

diff --git a/ui/src/services/files/components/tailwind/FilePicker.scala b/ui/src/services/files/components/tailwind/FilePicker.scala
index 2e8f690..0dabf8d 100644
--- a/ui/src/services/files/components/tailwind/FilePicker.scala
+++ b/ui/src/services/files/components/tailwind/FilePicker.scala
@@ -9,11 +9,10 @@
   sealed trait DoneEvent extends Event
   case class SelectionUpdated(files: Set[File]) extends DoneEvent
   case object SelectionCancelled extends DoneEvent
-  case object AvailableFilesRequested extends Event
 
   def apply(
       currentFiles: Signal[List[File]],
-      availableFilesStream: EventStream[List[File]]
+      availableFiles: Signal[List[File]]
   )(selectionUpdates: Observer[Event]): HtmlElement =
     val (updatesStream, updatesObserver) = EventStream.withObserver[Event]
     val selectorOpen = Var[Boolean](false)
@@ -53,7 +52,7 @@
           overlay,
           browserCenteringModalTrick,
           child <-- currentFiles.map(
-            FileSelector(_, availableFilesStream)(updatesObserver)
+            FileSelector(_, availableFiles)(updatesObserver)
           )
         )
       )
diff --git a/ui/src/services/files/components/tailwind/FileSelector.scala b/ui/src/services/files/components/tailwind/FileSelector.scala
index 48a7c8a..3226356 100644
--- a/ui/src/services/files/components/tailwind/FileSelector.scala
+++ b/ui/src/services/files/components/tailwind/FileSelector.scala
@@ -13,12 +13,9 @@
 
   def apply(
       initialFiles: List[File],
-      availableFilesStream: EventStream[List[File]]
+      availableFiles: Signal[List[File]]
   )(selectionUpdates: Observer[Event]): HtmlElement =
     val selectedFiles = Var[Set[File]](initialFiles.to(Set))
-    val availableFiles = availableFilesStream.startWithNone
-    // Request the files to display
-    selectionUpdates.onNext(AvailableFilesRequested)
     div(
       cls(
         "inline-block transform overflow-hidden rounded-lg bg-white text-left align-bottom shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-7xl sm:align-middle"
@@ -39,9 +36,7 @@
             )
           )
         ),
-        child <-- availableFiles
-          .split(_ => ())((_, _, af) => FileTable(af, selectedFiles))
-          .map(_.getOrElse(Loading))
+        FileTable(availableFiles, selectedFiles)
       ),
       div(
         cls("bg-gray-50 px-4 py-3 sm:flex sm:flex-row-reverse sm:px-6"),