diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua
index 6a7681fc4..f9cd9a034 100644
--- a/Moose Development/Moose/Tasking/Task_CARGO.lua	
+++ b/Moose Development/Moose/Tasking/Task_CARGO.lua	
@@ -214,11 +214,13 @@ do -- TASK_CARGO
     -- @param Tasking.Task_Cargo#TASK_CARGO Task
     function Fsm:onenterWaitingForCommand( TaskUnit, Task )
       self:E( { TaskUnit = TaskUnit, Task = Task and Task:GetClassNameAndID() } )
-      
+
+      if TaskUnit.Menu then
+        TaskUnit.Menu:Remove()
+      end
+            
       TaskUnit.Menu = MENU_GROUP:New( TaskUnit:GetGroup(), Task:GetName() .. " @ " .. TaskUnit:GetName() )
       
-      Task.SetCargo:Flush()
-      
       Task.SetCargo:ForEachCargo(
         
         --- @param Core.Cargo#CARGO Cargo
@@ -272,6 +274,8 @@ do -- TASK_CARGO
         
         end
       )
+      
+      self:__SelectAction( -15 )
     end
     
     ---