diff --git a/src/tui/app/machine/match_state.rs b/src/tui/app/machine/match_state.rs
index 4c8e83c..8d7dc6d 100644
--- a/src/tui/app/machine/match_state.rs
+++ b/src/tui/app/machine/match_state.rs
@@ -6,13 +6,11 @@ use musichoard::collection::{
     musicbrainz::{MbRefOption, Mbid},
 };
 
-use crate::tui::{
-    app::{
-        machine::{fetch_state::FetchState, input::Input, App, AppInner, AppMachine},
-        AlbumMatches, AppPublicState, AppState, ArtistMatches, Delta, EntityMatches,
-        IAppInteractMatch, MatchOption, MatchStatePublic, WidgetState,
-    },
-    lib::IMusicHoard,
+use crate::tui::app::{
+    machine::{fetch_state::FetchState, input::Input, App, AppInner, AppMachine},
+    selection::KeySelection,
+    AlbumMatches, AppPublicState, AppState, ArtistMatches, Delta, EntityMatches, IAppInteractMatch,
+    MatchOption, MatchStatePublic, WidgetState,
 };
 
 struct ArtistInfoTuple {
@@ -205,20 +203,21 @@ impl AppMachine<MatchState> {
     }
 
     fn select_artist(
-        mh: &mut Box<dyn IMusicHoard>,
+        inner: &mut AppInner,
         matches: &ArtistMatches,
         tuple: ArtistInfoTuple,
     ) -> Result<(), musichoard::Error> {
+        let mh = &mut inner.music_hoard;
         mh.merge_artist_info(&matches.matching.id, tuple.info)?;
         mh.set_artist_mb_ref(&matches.matching.id, tuple.mb_ref)
     }
 
     fn select_album(
-        mh: &mut Box<dyn IMusicHoard>,
+        inner: &mut AppInner,
         matches: &AlbumMatches,
         tuple: AlbumInfoTuple,
     ) -> Result<(), musichoard::Error> {
-        let coll = mh.get_collection();
+        let coll = inner.music_hoard.get_collection();
         let mut clashing = vec![];
         if let Some(artist) = coll.iter().find(|artist| artist.meta.id == matches.artist) {
             // While we expect only one, there is nothing stopping anybody from having multiple
@@ -231,8 +230,16 @@ impl AppMachine<MatchState> {
         }
 
         for album in clashing.into_iter() {
-            mh.remove_album(&matches.artist, &album)?;
+            let coll = inner.music_hoard.get_filtered();
+            let selection = KeySelection::get(coll, &inner.selection);
+
+            inner.music_hoard.remove_album(&matches.artist, &album)?;
+
+            let coll = inner.music_hoard.get_filtered();
+            inner.selection.select_by_id(coll, selection);
         }
+
+        let mh = &mut inner.music_hoard;
         mh.merge_album_info(&matches.artist, &matches.matching, tuple.info)?;
         mh.set_album_mb_ref(&matches.artist, &matches.matching, tuple.mb_ref)
     }
@@ -279,14 +286,14 @@ impl IAppInteractMatch for AppMachine<MatchState> {
     fn select(mut self) -> Self::APP {
         let index = self.state.state.list.selected().unwrap();
 
-        let mh = &mut self.inner.music_hoard;
+        let inner = &mut self.inner;
         let result = match self.state.current {
             EntityMatches::Artist(ref mut matches) => match matches.list.extract_info(index) {
-                InfoOption::Info(tuple) => Self::select_artist(mh, matches, tuple),
+                InfoOption::Info(tuple) => Self::select_artist(inner, matches, tuple),
                 InfoOption::NeedInput => return self.get_input(),
             },
             EntityMatches::Album(ref mut matches) => match matches.list.extract_info(index) {
-                InfoOption::Info(tuple) => Self::select_album(mh, matches, tuple),
+                InfoOption::Info(tuple) => Self::select_album(inner, matches, tuple),
                 InfoOption::NeedInput => return self.get_input(),
             },
         };