diff --git a/src/RemoteTech/FlightComputer/Commands/HibernationCommand.cs b/src/RemoteTech/FlightComputer/Commands/HibernationCommand.cs
index e4f359320..df3dc1a9a 100644
--- a/src/RemoteTech/FlightComputer/Commands/HibernationCommand.cs
+++ b/src/RemoteTech/FlightComputer/Commands/HibernationCommand.cs
@@ -93,10 +93,18 @@ public override bool Pop(FlightComputer fc)
                 {
                     activeHibCommand.Abort();
                 }
+                else if (this.PowerMode == PowerModes.Hibernate && activeHibCommand.PowerMode == PowerModes.Hibernate)
+                {
+                    return false;
+                }
                 else if (this.PowerMode == PowerModes.AntennaSaver&& activeHibCommand.PowerMode == PowerModes.Hibernate)
                 {
                     activeHibCommand.Abort();
                 }
+                else if (this.PowerMode == PowerModes.AntennaSaver && activeHibCommand.PowerMode == PowerModes.AntennaSaver)
+                {
+                    return false;
+                }
             }
 
             if (PowerMode == PowerModes.Hibernate)
@@ -141,7 +149,7 @@ public override bool Execute(FlightComputer fc, FlightCtrlState ctrlState)
                 var cmdsToDrop = new List<ICommand>();
                 for(int i=0; i<fc.QueuedCommands.Count(); i++)
                 {
-                    if (!(fc.QueuedCommands.ElementAt(i) is HibernationCommand))
+                    if (!(fc.QueuedCommands.ElementAt(i) is HibernationCommand || fc.QueuedCommands.ElementAt(i) is ManeuverCommand))//don't mess with player's maneuver nodes
                         cmdsToDrop.Add(fc.QueuedCommands.ElementAt(i));
                     else
                         break;//found next hiberation command