diff --git a/game/scripts/interface/door.rpy b/game/scripts/interface/door.rpy
index 92346442..d645ac4c 100644
--- a/game/scripts/interface/door.rpy
+++ b/game/scripts/interface/door.rpy
@@ -28,27 +28,21 @@ label summon_menu(xx=723, yy=90):
 
     $ current_sorting = summon_show_busy
 
-    label .after_init:
+    call screen summon(xx, yy)
 
-    show screen summon(xx, yy)
+    return
 
-    $ renpy.dynamic(__choice = ui.interact())
-
-    if __choice[0] == "summon":
-        hide screen summon
-        if not __choice[2]:
-            $ enable_game_menu()
-            $ renpy.jump_out_of_context("summon_"+__choice[1].lower())
-        else:
-            if game.daytime or __choice[1] in ["Tonks", "Snape"]:
-                nar "[__choice[1]] is currently busy. Try again later."
-            else:
-                nar "[__choice[1]] is currently asleep. Try again tomorrow."
+label .summon(char, busy):
+    if not busy:
+        $ enable_game_menu()
+        $ renpy.jump_out_of_context("summon_"+char.lower())
     else:
-        hide screen summon
-        return
+        if game.daytime or char in ["Tonks", "Snape"]:
+            nar "[char] is currently busy. Try again later."
+        else:
+            nar "[char] is currently asleep. Try again tomorrow."
 
-    jump .after_init
+    return
 
 screen summon(xx, yy):
     tag summon
@@ -115,10 +109,10 @@ screen summon_menu():
                                     text_xanchor 0.5
                                     text_size 20
                                     if not summon_dict[char]["busy"]:
-                                        action Return(["summon", char, False])
+                                        action Call("summon_menu.summon", char, False)
                                     else:
                                         text_color "#8C8C70"
-                                        action Return(["summon", char, True])
+                                        action Call("summon_menu.summon", char, True)
 
                                 add gui.format("interface/achievements/{}/spacer_left.webp")