diff --git a/src/app.rs b/src/app.rs
index 22cd91e..f67ca4e 100755
--- a/src/app.rs
+++ b/src/app.rs
@@ -152,7 +152,7 @@ impl App {
                 for (i, song) in self.queue_list.list.clone().iter().enumerate() {
                     if song.contains(&file) {
                         self.conn.conn.delete(i as u32).unwrap();
-                        if self.queue_list.index != 0 {
+                        if self.queue_list.index == self.queue_list.list.len() - 1 && self.queue_list.index != 0 {
                             self.queue_list.index -= 1;
                         }
                     }
diff --git a/src/connection.rs b/src/connection.rs
index 8f4fe72..7327bb9 100755
--- a/src/connection.rs
+++ b/src/connection.rs
@@ -4,8 +4,6 @@ use simple_dmenu::dmenu;
 use std::process::Command;
 use std::time::Duration;
 
-use crate::app::AppResult;
-
 pub type Result<T> = core::result::Result<T, Error>;
 pub type Error = Box<dyn std::error::Error>;