1 files changed, 9 insertions, 2 deletions
diff --git a/npc/functions/teleporter.txt b/npc/functions/teleporter.txt
index f3fb5efb6..3a762f163 100644
--- a/npc/functions/teleporter.txt
+++ b/npc/functions/teleporter.txt
@@ -42,12 +42,19 @@ function	script	TeleporterGate	{
         rif(TELEPORTERS & TP_BOSSR && .@IF != TP_BOSSR, l("Moubootaur Maze")), TP_BOOSR,
         l("None"), -1;
     mes "";
-    if (@menu != -1)
+    // Fortress Override
+    if (@menuret == TP_FORT && !$FORTRESS_STATE)
+        @menuret=-1;
+
+    // Proccess menu
+    if (@menuret != -1)
         delitem PileOfAsh, 1;
-    closedialog;
+    else
+        close;
 
     // Retrieve location specifics and warp
     .@x=array_find($@LOCMASTER_TP, @menuret);
+    closeclientdialog;
     warp $@LOCMASTER_MAP$[.@x], $@LOCMASTER_X[.@x], $@LOCMASTER_Y[.@x];
     return;
 }