diff --git a/src/Menus.cpp b/src/Menus.cpp
index ce16149af..f5a9295cc 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1169,9 +1169,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
       c->BeginSubMenu(_("&Align Tracks"));
 
       //c->BeginSubMenu(_("Just Move Tracks"));
-      c->AddItemList(wxT("Align"), alignLabelsNoSync, 2u, FN(OnAlignNoSync));
+      c->AddItemList(wxT("Align"), alignLabelsNoSync, 2u, FN(OnAlignNoSync),
+         AudioIONotBusyFlag | TracksSelectedFlag);
       c->AddSeparator();
-      c->AddItemList(wxT("Align"), alignLabels, mAlignLabelsCount, FN(OnAlign));
+      c->AddItemList(wxT("Align"), alignLabels, mAlignLabelsCount, FN(OnAlign),
+         AudioIONotBusyFlag | TracksSelectedFlag);
       c->AddSeparator();
       c->AddItem( wxT("MoveSelectionWithTracks"), XXO("&Move Selection with Tracks (on/off)"),
          FN(OnMoveSelectionWithTracks),
diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 2b3ee7b9a..a9ec1f19e 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -851,6 +851,7 @@ void CommandManager::AddItemList(const wxString & name,
                                  size_t nItems,
                                  CommandHandlerFinder finder,
                                  CommandFunctorPointer callback,
+                                 CommandFlag flags,
                                  bool bIsEffect)
 {
    for (size_t i = 0, cnt = nItems; i < cnt; i++) {
@@ -866,6 +867,7 @@ void CommandManager::AddItemList(const wxString & name,
                                               i,
                                               cnt,
                                               bIsEffect);
+      entry->mask = entry->flags = flags;
       CurrentMenu()->Append(entry->id, GetLabel(entry));
       mbSeparatorAllowed = true;
    }
diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
index 4047a5941..988aa9a07 100644
--- a/src/commands/CommandManager.h
+++ b/src/commands/CommandManager.h
@@ -192,6 +192,7 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
                     size_t nItems,
                     CommandHandlerFinder finder,
                     CommandFunctorPointer callback,
+                    CommandFlag flags,
                     bool bIsEffect = false);
 
    void AddItem(const wxChar *name,