diff --git a/src/menus/ToolbarMenus.cpp b/src/menus/ToolbarMenus.cpp
index 32fbd8daf..88614f356 100644
--- a/src/menus/ToolbarMenus.cpp
+++ b/src/menus/ToolbarMenus.cpp
@@ -5,6 +5,7 @@
 #include "../commands/CommandContext.h"
 #include "../commands/CommandManager.h"
 #include "../toolbars/ToolManager.h"
+#include "../CommonCommandFlags.h"
 
 /// Namespace for functions for View Toolbar menu
 namespace ToolbarActions {
@@ -64,7 +65,7 @@ BaseItemSharedPtr ToolbarsMenu()
          Section( "Manage",
             /* i18n-hint: (verb)*/
 			Command( wxT("EditMode"), XXO("&Edit Mode (on/off)"),
-				FN(OnEditMode), AlwaysEnabledFlag,
+				FN(OnEditMode), AudioIONotBusyFlag(),
 				Options{}.CheckTest( wxT("/GUI/Toolbars/EditMode"), false ) ),
             Command( wxT("ResetToolbars"), XXO("Reset Toolb&ars"),
                FN(OnResetToolBars), AlwaysEnabledFlag )