diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 120d85ab7..4b790b268 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -1732,7 +1732,7 @@ void TrackPanel::SetCursorAndTipWhenInLabel( Track * t,
 {
    if (event.m_x >= GetVRulerOffset() &&
          (t->GetKind() == Track::Wave) &&
-         ( ((WaveTrack *) t)->GetDisplay() <= WaveTrack::SpectralSelectionLogDisplay) )
+         ( ((WaveTrack *) t)->GetDisplay() != WaveTrack::PitchDisplay) )
    {
       *ppTip = _("Click to vertically zoom in. Shift-click to zoom out. Drag to specify a zoom region.");
       SetCursor(event.ShiftDown()? *mZoomOutCursor : *mZoomInCursor);
@@ -3854,8 +3854,8 @@ void TrackPanel::ForwardEventToWaveTrackEnvelope(wxMouseEvent & event)
 
    // AS: If we're using the right type of display for envelope operations
    //  ie one of the Wave displays
-   if (display <= 1) {
-      bool dB = (display == 1);
+   const bool dB = (display == WaveTrack::WaveformDBDisplay);
+   if (dB || (display == WaveTrack::WaveformDisplay)) {
       bool needUpdate;
 
       // AS: Then forward our mouse event to the envelope.
@@ -4629,7 +4629,7 @@ void TrackPanel::HandleVZoomClick( wxMouseEvent & event )
 
    // don't do anything if track is not wave or Spectrum/log Spectrum
    if (((mCapturedTrack->GetKind() == Track::Wave) &&
-            (((WaveTrack*)mCapturedTrack)->GetDisplay() <= WaveTrack::SpectralSelectionLogDisplay))
+            (((WaveTrack*)mCapturedTrack)->GetDisplay() != WaveTrack::PitchDisplay))
 #ifdef USE_MIDI
             || mCapturedTrack->GetKind() == Track::Note
 #endif
@@ -7016,11 +7016,13 @@ bool TrackPanel::HitTestEnvelope(Track *track, wxRect &r, wxMouseEvent & event)
    int displayType = wavetrack->GetDisplay();
    // Not an envelope hit, unless we're using a type of wavetrack display
    // suitable for envelopes operations, ie one of the Wave displays.
-   if ( displayType > 1)
+   const bool dB = (displayType == WaveTrack::WaveformDBDisplay);
+   if (!
+      (dB || (displayType == WaveTrack::WaveformDisplay))
+   )
       return false;  // No envelope, not a hit, so return.
 
    // Get envelope point, range 0.0 to 1.0
-   bool dB = (displayType == 1);
    double envValue = envelope->GetValueAtX(
       event.m_x, r, mViewInfo->h, mViewInfo->zoom );
 
@@ -8979,12 +8981,29 @@ void TrackPanel::OnMergeStereo(wxCommandEvent & WXUNUSED(event))
 ///  wxT("spectrum"), wxT("pitch") };
 void TrackPanel::OnSetDisplay(wxCommandEvent & event)
 {
-   int id = event.GetId();
-   wxASSERT(id >= OnWaveformID && id <= OnPitchID);
+   int idInt = event.GetId();
+   wxASSERT(idInt >= OnWaveformID && idInt <= OnPitchID);
    wxASSERT(mPopupMenuTarget
             && mPopupMenuTarget->GetKind() == Track::Wave);
 
-   id -= OnWaveformID;
+   WaveTrack::WaveTrackDisplay id;
+   switch (idInt) {
+   default:
+   case OnWaveformID:
+      id = WaveTrack::WaveformDisplay; break;
+   case OnWaveformDBID:
+      id = WaveTrack::WaveformDBDisplay; break;
+   case OnSpectrumID:
+      id = WaveTrack::SpectralSelectionDisplay; break;
+   case OnSpectrumLogID:
+      id = WaveTrack::SpectralSelectionLogDisplay; break;
+   case OnSpectralSelID:
+      id = WaveTrack::SpectralSelectionDisplay; break;
+   case OnSpectralSelLogID:
+      id = WaveTrack::SpectralSelectionLogDisplay; break;
+   case OnPitchID:
+      id = WaveTrack::PitchDisplay; break;
+   }
    WaveTrack *wt = (WaveTrack *) mPopupMenuTarget;
    if (wt->GetDisplay() != id) {
       wt->SetDisplay(WaveTrack::WaveTrackDisplay(id));
diff --git a/src/WaveTrack.h b/src/WaveTrack.h
index 5132addd5..065f64948 100644
--- a/src/WaveTrack.h
+++ b/src/WaveTrack.h
@@ -444,7 +444,7 @@ class AUDACITY_DLL_API WaveTrack: public Track {
       if( mDisplay == SpectralSelectionLogDisplay ){
       }
    }
-   int GetDisplay() const {return mDisplay;}
+   WaveTrackDisplay GetDisplay() const { return mDisplay; }
    int GetLastDisplay() {return mLastDisplay;}
 
    void GetDisplayBounds(float *min, float *max);
diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp
index 37ec58fb3..925c20888 100644
--- a/src/prefs/TracksPrefs.cpp
+++ b/src/prefs/TracksPrefs.cpp
@@ -56,23 +56,29 @@ void TracksPrefs::Populate()
    mSoloChoices.Add(_("None"));
 
 
-   // Keep the same order as in TrackPanel.cpp menu: OnWaveformID, OnWaveformDBID, OnSpectrumID, OnSpectrumLogID, 
-   // OnSpectralSelID, OnSpectralSelLogID, OnPitchID
-   mViewCodes.Add(0);
-   mViewCodes.Add(1);
-   mViewCodes.Add(2);
-   mViewCodes.Add(3);
-   mViewCodes.Add(4);
-   mViewCodes.Add(5);
-   mViewCodes.Add(6);
+   // Keep view choices and codes in proper correspondence --
+   // we don't display them by increasing integer values.
 
    mViewChoices.Add(_("Waveform"));
+   mViewCodes.Add(int(WaveTrack::WaveformDisplay));
+
    mViewChoices.Add(_("Waveform (dB)"));
+   mViewCodes.Add(int(WaveTrack::WaveformDBDisplay));
+
    mViewChoices.Add(_("Spectrogram"));
+   mViewCodes.Add(int(WaveTrack::SpectrumDisplay));
+
    mViewChoices.Add(_("Spectrogram log(f)"));
+   mViewCodes.Add(int(WaveTrack::SpectrumLogDisplay));
+
    mViewChoices.Add(_("Spectral Selection"));
+   mViewCodes.Add(int(WaveTrack::SpectralSelectionDisplay));
+
    mViewChoices.Add(_("Spectral Selection log(f)"));
+   mViewCodes.Add(int(WaveTrack::SpectralSelectionLogDisplay));
+
    mViewChoices.Add(_("Pitch (EAC)"));
+   mViewCodes.Add(int(WaveTrack::PitchDisplay));
 
    //------------------------- Main section --------------------
    // Now construct the GUI itself.