diff --git a/Elwig/Windows/ContextWindow.cs b/Elwig/Windows/ContextWindow.cs
index 1a8c732..f255deb 100644
--- a/Elwig/Windows/ContextWindow.cs
+++ b/Elwig/Windows/ContextWindow.cs
@@ -46,10 +46,11 @@ namespace Elwig.Windows {
 
         protected async Task RenewContext() {
             if (!_renewPending) return;
-            Context.Dispose();
+            var old = Context;
             Context = new();
             await OnRenewContext();
             _renewPending = false;
+            old.Dispose();
         }
 
         abstract protected Task OnRenewContext();