diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 0c62bfa65..a3be6b483 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -3454,6 +3454,8 @@ TrackPanelCellIterator::TrackPanelCellIterator(TrackPanel *trackPanel, bool begi
       else
          mpCell = trackPanel->GetBackgroundCell();
    }
+   else
+      mDidBackground = true;
 
    const auto size = mPanel->GetSize();
    mRect = { 0, 0, size.x, size.y };
diff --git a/src/TrackPanelCellIterator.h b/src/TrackPanelCellIterator.h
index ae5022781..e34bd953e 100644
--- a/src/TrackPanelCellIterator.h
+++ b/src/TrackPanelCellIterator.h
@@ -43,7 +43,8 @@ public:
    friend inline bool operator==
       (const TrackPanelCellIterator &lhs, const TrackPanelCellIterator &rhs)
    {
-      return lhs.mpCell == rhs.mpCell;
+      return lhs.mpCell == rhs.mpCell &&
+         lhs.mDidBackground == rhs.mDidBackground;
    }
 
    value_type operator * () const;