diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp
index bb84dee35d..cf23c2e79e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp
@@ -120,79 +120,51 @@ namespace EMStudio
         MotionSetsWindowPlugin* m_plugin;
     };
 
-
-    // constructor
     MotionSetsWindowPlugin::MotionSetsWindowPlugin()
         : EMStudio::DockWidgetPlugin()
     {
         m_dialogStack                    = nullptr;
         m_selectedSet                    = nullptr;
-        m_createMotionSetCallback        = nullptr;
-        m_reinitCallback                = nullptr;
-        m_adjustMotionSetCallback        = nullptr;
-        m_motionSetAddMotionCallback     = nullptr;
-        m_motionSetRemoveMotionCallback  = nullptr;
-        m_motionSetAdjustMotionCallback  = nullptr;
-        m_loadMotionSetCallback          = nullptr;
         m_motionSetManagementWindow      = nullptr;
         m_motionSetWindow                = nullptr;
         m_dirtyFilesCallback             = nullptr;
     }
 
-
-    // destructor
     MotionSetsWindowPlugin::~MotionSetsWindowPlugin()
     {
-        GetCommandManager()->RemoveCommandCallback(m_createMotionSetCallback, false);
-        GetCommandManager()->RemoveCommandCallback(m_reinitCallback, false);
-        GetCommandManager()->RemoveCommandCallback(m_adjustMotionSetCallback, false);
-        GetCommandManager()->RemoveCommandCallback(m_motionSetAddMotionCallback, false);
-        GetCommandManager()->RemoveCommandCallback(m_motionSetRemoveMotionCallback, false);
-        GetCommandManager()->RemoveCommandCallback(m_motionSetAdjustMotionCallback, false);
-        GetCommandManager()->RemoveCommandCallback(m_loadMotionSetCallback, false);
-
-        delete m_createMotionSetCallback;
-        delete m_reinitCallback;
-        delete m_adjustMotionSetCallback;
-        delete m_motionSetAddMotionCallback;
-        delete m_motionSetRemoveMotionCallback;
-        delete m_motionSetAdjustMotionCallback;
-        delete m_loadMotionSetCallback;
+        for (MCore::Command::Callback* callback : m_callbacks)
+        {
+            GetCommandManager()->RemoveCommandCallback(callback, false);
+            delete callback;
+        }
 
         GetMainWindow()->GetDirtyFileManager()->RemoveCallback(m_dirtyFilesCallback, false);
         delete m_dirtyFilesCallback;
     }
 
-
-    // clone the log window
     EMStudioPlugin* MotionSetsWindowPlugin::Clone()
     {
         MotionSetsWindowPlugin* newPlugin = new MotionSetsWindowPlugin();
         return newPlugin;
     }
 
-
     // init after the parent dock window has been created
     bool MotionSetsWindowPlugin::Init()
     {
-        m_createMotionSetCallback        = new CommandCreateMotionSetCallback(false);
-        m_reinitCallback                = new CommandReinitCallback(false);
-        m_adjustMotionSetCallback        = new CommandAdjustMotionSetCallback(false);
-        m_motionSetAddMotionCallback     = new CommandMotionSetAddMotionCallback(false);
-        m_motionSetRemoveMotionCallback  = new CommandMotionSetRemoveMotionCallback(false);
-        m_motionSetAdjustMotionCallback  = new CommandMotionSetAdjustMotionCallback(false);
-        m_loadMotionSetCallback          = new CommandLoadMotionSetCallback(false);
+        auto AddCallback = [=](const char* commandName, MCore::Command::Callback* callback)
+        {
+            m_callbacks.emplace_back(callback);
+            GetCommandManager()->RegisterCommandCallback(commandName, m_callbacks.back());
+        };
 
-        GetCommandManager()->RegisterCommandCallback("CreateMotionSet", m_createMotionSetCallback);
-        GetCommandManager()->RegisterCommandCallback("RemoveMotionSet", m_reinitCallback);
-        GetCommandManager()->RegisterCommandCallback("AdjustMotionSet", m_adjustMotionSetCallback);
-
-        GetCommandManager()->RegisterCommandCallback("MotionSetAddMotion", m_motionSetAddMotionCallback);
-        GetCommandManager()->RegisterCommandCallback("MotionSetRemoveMotion", m_motionSetRemoveMotionCallback);
-        GetCommandManager()->RegisterCommandCallback("MotionSetAdjustMotion", m_motionSetAdjustMotionCallback);
-        GetCommandManager()->RegisterCommandCallback("LoadMotionSet", m_loadMotionSetCallback);
-
-        GetCommandManager()->RegisterCommandCallback("RemoveMotion", m_reinitCallback);
+        AddCallback("CreateMotionSet", new CommandReinitCallback(false));
+        AddCallback("RemoveMotionSet", new CommandReinitCallback(false));
+        AddCallback("RemoveMotion", new CommandReinitCallback(false));
+        AddCallback("AdjustMotionSet", new CommandAdjustMotionSetCallback(false));
+        AddCallback("MotionSetAddMotion", new CommandMotionSetAddMotionCallback(false));
+        AddCallback("MotionSetRemoveMotion", new CommandMotionSetRemoveMotionCallback(false));
+        AddCallback("MotionSetAdjustMotion", new CommandMotionSetAdjustMotionCallback(false));
+        AddCallback("LoadMotionSet", new CommandLoadMotionSetCallback(false));
 
         // create the dialog stack
         assert(m_dialogStack == nullptr);
@@ -393,12 +365,7 @@ namespace EMStudio
         }
 
         MotionSetsWindowPlugin* motionSetsPlugin = (MotionSetsWindowPlugin*)plugin;
-
-        // is the plugin visible? only update it if it is visible
-        if (motionSetsPlugin->GetDockWidget()->visibleRegion().isEmpty() == false)
-        {
-            motionSetsPlugin->ReInit();
-        }
+        motionSetsPlugin->ReInit();
 
         return true;
     }
@@ -504,26 +471,14 @@ namespace EMStudio
     }
 
 
-    bool MotionSetsWindowPlugin::CommandCreateMotionSetCallback::Execute([[maybe_unused]] MCore::Command* command, const MCore::CommandLine& commandLine)
-    {
-        MCORE_UNUSED(commandLine);
-        return ReInitMotionSetsPlugin();
-    }
-
-
-    bool MotionSetsWindowPlugin::CommandCreateMotionSetCallback::Undo(MCore::Command* command, const MCore::CommandLine& commandLine)                   { MCORE_UNUSED(command); MCORE_UNUSED(commandLine); return ReInitMotionSetsPlugin(); }
-
-
     bool MotionSetsWindowPlugin::CommandReinitCallback::Execute([[maybe_unused]] MCore::Command* command, const MCore::CommandLine& commandLine)
     {
         MCORE_UNUSED(commandLine);
         return ReInitMotionSetsPlugin();
     }
 
-
     bool MotionSetsWindowPlugin::CommandReinitCallback::Undo(MCore::Command* command, const MCore::CommandLine& commandLine)                   { MCORE_UNUSED(command); MCORE_UNUSED(commandLine); return ReInitMotionSetsPlugin(); }
 
-
     bool MotionSetsWindowPlugin::CommandAdjustMotionSetCallback::Execute(MCore::Command* command, const MCore::CommandLine& commandLine)
     {
         MCORE_UNUSED(command);
@@ -544,7 +499,6 @@ namespace EMStudio
         return true;
     }
 
-
     bool MotionSetsWindowPlugin::CommandAdjustMotionSetCallback::Undo(MCore::Command* command, const MCore::CommandLine& commandLine)
     {
         MCORE_UNUSED(command);
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
index 459118c831..377ae3d849 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
@@ -85,22 +85,14 @@ namespace EMStudio
         void WindowReInit(bool visible);
 
     private:
-        // declare the callbacks
-        MCORE_DEFINECOMMANDCALLBACK(CommandCreateMotionSetCallback);
         MCORE_DEFINECOMMANDCALLBACK(CommandReinitCallback);
+        MCORE_DEFINECOMMANDCALLBACK(CommandRemoveMotionSetCallback);
         MCORE_DEFINECOMMANDCALLBACK(CommandAdjustMotionSetCallback);
         MCORE_DEFINECOMMANDCALLBACK(CommandMotionSetAddMotionCallback);
         MCORE_DEFINECOMMANDCALLBACK(CommandMotionSetRemoveMotionCallback);
         MCORE_DEFINECOMMANDCALLBACK(CommandMotionSetAdjustMotionCallback);
         MCORE_DEFINECOMMANDCALLBACK(CommandLoadMotionSetCallback);
-
-        CommandCreateMotionSetCallback*         m_createMotionSetCallback;
-        CommandReinitCallback*                  m_reinitCallback;
-        CommandAdjustMotionSetCallback*         m_adjustMotionSetCallback;
-        CommandMotionSetAddMotionCallback*      m_motionSetAddMotionCallback;
-        CommandMotionSetRemoveMotionCallback*   m_motionSetRemoveMotionCallback;
-        CommandMotionSetAdjustMotionCallback*   m_motionSetAdjustMotionCallback;
-        CommandLoadMotionSetCallback*           m_loadMotionSetCallback;
+        AZStd::vector<MCore::Command::Callback*> m_callbacks;
 
         MotionSetManagementWindow*              m_motionSetManagementWindow;
         MotionSetWindow*                        m_motionSetWindow;