diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 64e809a32..23bec9760 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -824,14 +824,15 @@ void Playlist::Restore() {
   items_ = backend_->GetPlaylistItems(id_);
 
   PlaylistBackend::Playlist p = backend_->GetPlaylist(id_);
-  last_played_item_index_ =
-      p.last_played == -1 ? QModelIndex() : index(p.last_played);
 
   for (int i=0 ; i<items_.count() ; ++i) {
     virtual_items_ << i;
   };
 
   reset();
+
+  last_played_item_index_ =
+      p.last_played == -1 ? QModelIndex() : index(p.last_played);
 }
 
 bool Playlist::removeRows(int row, int count, const QModelIndex& parent) {
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index ed5d1de59..2f320beb1 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -157,7 +157,7 @@ void PlaylistManager::SetActivePlaylist(int id) {
 
   // Kinda a hack: unset the current item from the old active playlist before
   // setting the new one
-  if (active_ != -1)
+  if (active_ != -1 && active_ != id)
     active()->set_current_index(-1);
 
   active_ = id;