diff --git a/python_payload/st3m/ui/view.py b/python_payload/st3m/ui/view.py
index a14fb0e748c82e496c34e4e696f9fdb8146d1cfe..cbab783da6b270b1b2c31c316223b2ca570e0c33 100644
--- a/python_payload/st3m/ui/view.py
+++ b/python_payload/st3m/ui/view.py
@@ -209,11 +209,11 @@ class ViewManager(Responder):
 
         self._transitioning = False
 
-        if self._incoming is not None:
-            self._incoming.on_enter_done()
         if self._outgoing is not None:
             self._outgoing.on_exit_done()
             self._outgoing = None
+        if self._incoming is not None:
+            self._incoming.on_enter_done()
 
     def _perform_pending(self):
         if not self._pending: