diff --git a/src/modes/world_status.hpp b/src/modes/world_status.hpp
index bccb6b716..fdb2cc3e0 100644
--- a/src/modes/world_status.hpp
+++ b/src/modes/world_status.hpp
@@ -157,11 +157,13 @@ public:
     // Note: GO_PHASE is both: start phase and race phase
     bool     isStartPhase() const  { return m_phase<GO_PHASE;               }
     // ------------------------------------------------------------------------
-    bool     isRacePhase()  const  { return m_phase>=GO_PHASE &&
-                                            m_phase<FINISH_PHASE;           }
+    bool     isRacePhase()  const  { return (m_phase>=GO_PHASE &&
+                                            m_phase<FINISH_PHASE) ||
+                                            m_phase == GOAL_PHASE;          }
     // ------------------------------------------------------------------------
-    bool     isActiveRacePhase() const { return m_phase>=GO_PHASE &&
-                                                m_phase<DELAY_FINISH_PHASE; }
+    bool     isActiveRacePhase() const { return (m_phase>=GO_PHASE &&
+                                                m_phase<DELAY_FINISH_PHASE) ||
+                                                m_phase == GOAL_PHASE; }
     // ------------------------------------------------------------------------
     /** While the race menu is being displayed, m_phase is limbo, and
      *  m_previous_phase is finish. So we have to test this case, too.  */