diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 1a94a59dd..b54d4a5a7 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -2561,8 +2561,8 @@ void MainWindow::updateStatus(MPDStatus * const status)
 
     // Check if song has changed or we're playing again after being stopped
     // and update song info if needed
-    if (lastState == MPDState_Inactive
-            || (lastState == MPDState_Stopped && status->state() == MPDState_Playing)
+    if ((MPDState_Inactive==lastState && MPDState_Inactive!=status->state())
+            || (MPDState_Stopped==lastState && MPDState_Playing==status->state())
             || lastSongId != status->songId()) {
         emit currentSong();
     }