diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 4c1218d6b..fd060d09a 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -52,6 +52,7 @@ is time to refresh some aspect of the screen.
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include "AdornedRulerPanel.h"
+#include "tracks/ui/CommonTrackPanelCell.h"
 #include "KeyboardCapture.h"
 #include "Project.h"
 #include "ProjectAudioIO.h"
@@ -861,12 +862,12 @@ void TrackPanel::DrawTracks(wxDC * dc)
 }
 
 void TrackPanel::SetBackgroundCell
-(const std::shared_ptr< TrackPanelCell > &pCell)
+(const std::shared_ptr< CommonTrackPanelCell > &pCell)
 {
    mpBackground = pCell;
 }
 
-std::shared_ptr< TrackPanelCell > TrackPanel::GetBackgroundCell()
+std::shared_ptr< CommonTrackPanelCell > TrackPanel::GetBackgroundCell()
 {
    return mpBackground;
 }
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 000c73d71..bcdaff5b7 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -31,6 +31,9 @@
 
 class wxRect;
 
+// All cells of the TrackPanel are subclasses of this
+class CommonTrackPanelCell;
+
 class SpectrumAnalyst;
 class Track;
 class TrackList;
@@ -177,8 +180,8 @@ public:
    // Set the object that performs catch-all event handling when the pointer
    // is not in any track or ruler or control panel.
    void SetBackgroundCell
-      (const std::shared_ptr< TrackPanelCell > &pCell);
-   std::shared_ptr< TrackPanelCell > GetBackgroundCell();
+      (const std::shared_ptr< CommonTrackPanelCell > &pCell);
+   std::shared_ptr< CommonTrackPanelCell > GetBackgroundCell();
 
 public:
 
@@ -218,7 +221,7 @@ protected:
 
  protected:
 
-   std::shared_ptr<TrackPanelCell> mpBackground;
+   std::shared_ptr<CommonTrackPanelCell> mpBackground;
 
    DECLARE_EVENT_TABLE()