From f4de84ad872be5aabc664c64c05e249c0affea0b Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 6 Aug 2022 14:15:09 +0100
Subject: [PATCH] move unregister

---
 src/textual/message_pump.py | 2 --
 src/textual/widget.py       | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/textual/message_pump.py b/src/textual/message_pump.py
index 8940b95b2..038078051 100644
--- a/src/textual/message_pump.py
+++ b/src/textual/message_pump.py
@@ -216,10 +216,8 @@ class MessagePump:
         """Close message queue, and optionally wait for queue to finish processing."""
         if self._closed or self._closing:
             return
-        print(self, "close_messages")
         self._closing = True
         await self._message_queue.put(MessagePriority(None))
-        self.app._unregister(self)
         cancel_tasks = list(self._child_tasks)
         for task in cancel_tasks:
             task.cancel()
diff --git a/src/textual/widget.py b/src/textual/widget.py
index 652c4b384..6c970c32a 100644
--- a/src/textual/widget.py
+++ b/src/textual/widget.py
@@ -1149,6 +1149,7 @@ class Widget(DOMNode):
 
     async def on_remove(self, event: events.Remove) -> None:
         await self.close_messages()
+        self.app._unregister(self)
         assert self.parent
         self.parent.refresh(layout=True)