diff --git a/src/core/player.cpp b/src/core/player.cpp
index 9bda1dec0..bd0a107cd 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -292,6 +292,7 @@ void Player::RestartOrPrevious() {
 
 void Player::Stop(bool stop_after) {
   engine_->Stop(stop_after);
+  app_->playlist_manager()->active()->set_current_row(-1);
   current_item_.reset();
 }