diff --git a/Source/Client/Persistent/TradingUI.cs b/Source/Client/Persistent/TradingUI.cs
index 8e9d5168..0bdb6008 100644
--- a/Source/Client/Persistent/TradingUI.cs
+++ b/Source/Client/Persistent/TradingUI.cs
@@ -67,8 +67,10 @@ public override void DoWindowContents(Rect inRect)
                 selectedSession = session.SessionId;
             }
 
+            Faction factionContext = session.NegotiatorFaction;
             try
             {
+                factionContext = FactionContext.Push(factionContext);
                 MpTradeSession.SetTradeSession(session);
                 drawingTrade = this;
 
@@ -124,6 +126,9 @@ public override void DoWindowContents(Rect inRect)
             {
                 drawingTrade = null;
                 MpTradeSession.SetTradeSession(null);
+                if (factionContext != null) {
+                    FactionContext.Pop();
+                }
             }
         }