diff --git a/bin/editor.rs b/bin/editor.rs
index b95bebb..f35a43b 100644
--- a/bin/editor.rs
+++ b/bin/editor.rs
@@ -780,30 +780,33 @@ mod animations {
     pub fn add_animations_ui(
         player_spawned: Query<&Name, Added<AnimationPlayer>>,
         widget: Query<Entity, With<AnimationWidget>>,
-        gltfs: Res<Assets<Gltf>>,
         mut commands: Commands,
+        gltfs: Res<Assets<Gltf>>,
         clips: Res<Assets<AnimationClip>>,
     ) {
         player_spawned.iter().for_each(|player_name| {
-            gltfs.iter().for_each(|(_, gltf)| {
-                gltf.named_animations
-                    .iter()
-                    .for_each(|(clip_name, handle)| {
-                        info!("Checking clip {:?}", clip_name);
-                        let clip = clips.get(&handle).expect("load animation clip");
-                        clip.compatible_with(player_name).then(|| {
-                            create_asset_button(
-                                &widget,
-                                &mut commands,
-                                ui::TargetAsset {
-                                    handle: handle.clone(),
-                                },
-                                clip_name.clone(),
-                                None,
-                            );
-                        });
-                    });
-            });
+            gltfs
+                .iter()
+                .flat_map(|(_, gltf)| gltf.named_animations.iter())
+                .filter_map(|(clip_name, handle)| {
+                    if let Some(clip) = clips.get(&handle) {
+                        Some((clip_name, handle, clip))
+                    } else {
+                        None
+                    }
+                })
+                .filter(|(_, _, clip)| clip.compatible_with(player_name))
+                .for_each(|(clip_name, handle, _)| {
+                    create_asset_button(
+                        &widget,
+                        &mut commands,
+                        ui::TargetAsset {
+                            handle: handle.clone(),
+                        },
+                        clip_name.clone(),
+                        None,
+                    );
+                });
         });
     }