diff --git a/NEWS b/NEWS
index a052efa6f..36e4dcaf4 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ ver 0.20.6 (not yet released)
   - ffmpeg: re-enable as fallback
   - mpcdec: fix crash (division by zero) after seeking
   - sidplay: make compatible with libsidplayfp < 1.8
+* fix stream tags after automatic song change
 * workaround for GCC 4.9.4 / libstdc++ bug (build failure)
 
 ver 0.20.5 (2017/02/20)
diff --git a/src/Partition.cxx b/src/Partition.cxx
index 59754d2fb..f066041ec 100644
--- a/src/Partition.cxx
+++ b/src/Partition.cxx
@@ -141,9 +141,9 @@ Partition::OnMixerVolumeChanged(gcc_unused Mixer &mixer, gcc_unused int volume)
 void
 Partition::OnGlobalEvent(unsigned mask)
 {
-	if ((mask & TAG_MODIFIED) != 0)
-		TagModified();
-
 	if ((mask & SYNC_WITH_PLAYER) != 0)
 		SyncWithPlayer();
+
+	if ((mask & TAG_MODIFIED) != 0)
+		TagModified();
 }