diff --git a/rust-libs/ease-client-test/src/lib.rs b/rust-libs/ease-client-test/src/lib.rs
index 4a905a8e..d860171f 100644
--- a/rust-libs/ease-client-test/src/lib.rs
+++ b/rust-libs/ease-client-test/src/lib.rs
@@ -4,8 +4,8 @@ use std::time::Duration;
 
 use ease_client::modules::timer::to_host::TimerService;
 use ease_client::{
-    build_state_manager, build_view_manager, modules::*, MistyController, MistyResourceId, MistyServiceManager,
-    RootViewModelState,
+    build_state_manager, build_view_manager, modules::*, MistyController, MistyResourceId,
+    MistyServiceManager, RootViewModelState,
 };
 
 use fake_player::*;
@@ -159,6 +159,7 @@ impl TestApp {
             let storage_id = self.get_first_storage_id_from_latest_state();
             self.call_controller(controller_prepare_import_entries_in_current_playlist, ());
             self.call_controller(controller_select_storage_in_import, storage_id);
+            self.wait_network();
             let state = self.latest_state();
             let entries = state.current_storage_entries.unwrap();
             self.call_controller(controller_select_entry, entries.entries[4].path.clone());
diff --git a/rust-libs/ease-remote-storage/src/impls/local.rs b/rust-libs/ease-remote-storage/src/impls/local.rs
index 1be7bcbb..b4684c5f 100644
--- a/rust-libs/ease-remote-storage/src/impls/local.rs
+++ b/rust-libs/ease-remote-storage/src/impls/local.rs
@@ -48,6 +48,7 @@ impl LocalBackend {
                 is_dir: metadata.is_dir(),
             });
         }
+        ret.sort_by(|a, b| a.name.cmp(&b.name));
         Ok(ret)
     }