diff --git a/qt_ui/windows/mission/flight/QFlightCreator.py b/qt_ui/windows/mission/flight/QFlightCreator.py
index fbbacab0..c432a845 100644
--- a/qt_ui/windows/mission/flight/QFlightCreator.py
+++ b/qt_ui/windows/mission/flight/QFlightCreator.py
@@ -85,7 +85,7 @@ class QFlightCreator(QDialog):
                 squadron, initial_size=self.flight_size_spinner.value()
             )
         self.roster_editor = FlightRosterEditor(roster)
-        self.flight_size_spinner.valueChanged.connect(self.resize_roster)
+        self.flight_size_spinner.valueChanged.connect(self.roster_editor.resize)
         self.squadron_selector.currentIndexChanged.connect(self.on_squadron_changed)
         roster_layout = QHBoxLayout()
         layout.addLayout(roster_layout)
@@ -136,10 +136,6 @@ class QFlightCreator(QDialog):
     def set_custom_name_text(self, text: str):
         self.custom_name_text = text
 
-    def resize_roster(self, new_size: int) -> None:
-        self.roster_editor.roster.resize(new_size)
-        self.roster_editor.resize(new_size)
-
     def verify_form(self) -> Optional[str]:
         aircraft: Optional[Type[FlyingType]] = self.aircraft_selector.currentData()
         squadron: Optional[Squadron] = self.squadron_selector.currentData()
@@ -196,7 +192,6 @@ class QFlightCreator(QDialog):
         self.squadron_selector.update_items(
             self.task_selector.currentData(), new_aircraft
         )
-        self.departure.change_aircraft(new_aircraft)
         self.divert.change_aircraft(new_aircraft)
 
     def on_departure_changed(self, departure: ControlPoint) -> None:
@@ -229,7 +224,7 @@ class QFlightCreator(QDialog):
             self.roster_editor.replace(
                 FlightRoster(squadron, self.flight_size_spinner.value())
             )
-        self.on_departure_changed(squadron.location)
+            self.on_departure_changed(squadron.location)
 
     def update_max_size(self, available: int) -> None:
         aircraft = self.aircraft_selector.currentData()
diff --git a/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py b/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py
index 665e45ae..2aa0db27 100644
--- a/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py
+++ b/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py
@@ -176,6 +176,8 @@ class FlightRosterEditor(QVBoxLayout):
     def resize(self, new_size: int) -> None:
         if new_size > self.MAX_PILOTS:
             raise ValueError("A flight may not have more than four pilots.")
+        if self.roster is not None:
+            self.roster.resize(new_size)
         for controls in self.pilot_controls[:new_size]:
             controls.enable_and_reset()
         for controls in self.pilot_controls[new_size:]: