diff --git a/gen/ato.py b/gen/ato.py
index a2e4a8a1..ff1bb5a9 100644
--- a/gen/ato.py
+++ b/gen/ato.py
@@ -89,6 +89,7 @@ class Package:
             FlightType.CAP,
             FlightType.BARCAP,
             FlightType.EWAR,
+            FlightType.ESCORT,
         ]
         for task in task_priorities:
             if flight_counts[task]:
diff --git a/qt_ui/widgets/combos/QFlightTypeComboBox.py b/qt_ui/widgets/combos/QFlightTypeComboBox.py
index 8da41217..9577b26c 100644
--- a/qt_ui/widgets/combos/QFlightTypeComboBox.py
+++ b/qt_ui/widgets/combos/QFlightTypeComboBox.py
@@ -18,11 +18,11 @@ class QFlightTypeComboBox(QComboBox):
     """Combo box for selecting a flight task type."""
 
     COMMON_ENEMY_MISSIONS = [
+        FlightType.ESCORT,
         FlightType.TARCAP,
         FlightType.SEAD,
         FlightType.DEAD,
         # TODO: FlightType.ELINT,
-        # TODO: FlightType.ESCORT,
         # TODO: FlightType.EWAR,
         # TODO: FlightType.RECON,
     ]
@@ -42,9 +42,9 @@ class QFlightTypeComboBox(QComboBox):
     ]
 
     ENEMY_CARRIER_MISSIONS = [
+        FlightType.ESCORT,
         FlightType.TARCAP,
         # TODO: FlightType.ANTISHIP
-        # TODO: FlightType.ESCORT,
     ]
 
     ENEMY_AIRBASE_MISSIONS = [
diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
index 2879c356..5e9e57a2 100644
--- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
+++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
@@ -57,6 +57,7 @@ class QFlightWaypointTab(QFrame):
         recreate_types = [
             FlightType.CAS,
             FlightType.CAP,
+            FlightType.ESCORT,
             FlightType.SEAD,
             FlightType.STRIKE
         ]