2 files changed, 4 insertions, 1 deletions
diff --git a/src/cmd.c b/src/cmd.c
index eb3b611..69feead 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -196,6 +196,7 @@ cmd_reindex(const char *name)
 	if (player.track) {
 		playing_tag = player.track->tag;
 		playing_name = astrdup(player.track->name);
+		player.track = NULL;
 	}
 
 	/* update each tag specified */
diff --git a/src/data.c b/src/data.c
index 8870165..b70f80b 100644
--- a/src/data.c
+++ b/src/data.c
@@ -330,7 +330,7 @@ tracks_update(struct tag *tag)
 		track_add(tag, ent->d_name);
 	}
 
-	tag->index_dirty = false;
+	tag->index_dirty = true;
 
 	closedir(dir);
 
@@ -492,6 +492,8 @@ track_rm(struct track *track, bool sync_fs)
 	if (sync_fs && !rm_file(track->fpath))
 		return false;
 
+	track->tag->index_dirty = true;
+
 	/* remove from tracks list */
 	link_pop(&track->link);