diff --git a/src/Menus.cpp b/src/Menus.cpp
index 3b3c1c839..b169970a7 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1014,7 +1014,7 @@ void AudacityProject::CreateMenusAndCommands()
    PopulateEffectsMenu(c,
                        EffectTypeProcess,
                        AudioIONotBusyFlag | TimeSelectedFlag | WaveTracksSelectedFlag,
-                       AudioIONotBusyFlag | TimeSelectedFlag | WaveTracksSelectedFlag | IsRealtimeNotActiveFlag);
+                       TracksExistFlag | IsRealtimeNotActiveFlag);
 #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
    c->AddSeparator();
    // We could say Manage Effects on the menu, but More... is more intuitive.
@@ -1039,7 +1039,7 @@ void AudacityProject::CreateMenusAndCommands()
    PopulateEffectsMenu(c,
                        EffectTypeAnalyze,
                        AudioIONotBusyFlag | TimeSelectedFlag | WaveTracksSelectedFlag,
-                       AudioIONotBusyFlag | TimeSelectedFlag | WaveTracksSelectedFlag | IsRealtimeNotActiveFlag);
+                       TracksExistFlag | IsRealtimeNotActiveFlag);
 #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
    c->AddSeparator();
    c->AddItem(wxT("ManageAnalyzers"), _("More..."), FN(OnManageAnalyzers));
@@ -3226,6 +3226,10 @@ bool AudacityProject::OnEffect(const PluginID & ID, int flags)
          mTracks->Add(newTrack);
          newTrack->SetSelected(true);
       }
+      else {
+         wxMessageBox(_("You must select a track first."));
+         return false;
+      }
    }
 
    EffectManager & em = EffectManager::Get();