diff --git a/src/library.rs b/src/library.rs
index 0d2f740..cdc31cd 100644
--- a/src/library.rs
+++ b/src/library.rs
@@ -248,6 +248,8 @@ impl Library {
         self.artist_selected = new as usize;
         self.right_selected = self.first_track_row();
 
+        self.right_state = ListState::default();
+
         self.left_state.select(Some(self.artist_selected));
         self.right_state.select(Some(self.right_selected));
     }
@@ -275,6 +277,7 @@ impl Library {
             new_pos = len - 1;
         } else if new_pos >= len {
             new_pos = 0;
+			self.right_state = ListState::default();
         }
 
         self.right_selected = track_rows[new_pos as usize];