diff --git a/ports/servoshell/egl/app.rs b/ports/servoshell/egl/app.rs
index 7100abf5a30..e379ee8aaec 100644
--- a/ports/servoshell/egl/app.rs
+++ b/ports/servoshell/egl/app.rs
@@ -349,7 +349,7 @@ impl App {
 
     /// Request shutdown. Will call on_shutdown_complete.
     pub fn request_shutdown(&self) {
-        self.state.servo.start_shutting_down();
+        self.state.schedule_exit();
         self.spin_event_loop();
     }
 
diff --git a/ports/servoshell/running_app_state.rs b/ports/servoshell/running_app_state.rs
index 2bff3ca44ea..decea59c41b 100644
--- a/ports/servoshell/running_app_state.rs
+++ b/ports/servoshell/running_app_state.rs
@@ -297,7 +297,7 @@ impl RunningAppState {
         }
 
         if self.servoshell_preferences.exit_after_stable_image && self.achieved_stable_image.get() {
-            self.servo.start_shutting_down();
+            self.schedule_exit();
         }
 
         // When a ServoShellWindow has no more WebViews, close it. When no more windows are open, exit
diff --git a/ports/servoshell/webdriver.rs b/ports/servoshell/webdriver.rs
index 226f78ad93f..05c4ed55135 100644
--- a/ports/servoshell/webdriver.rs
+++ b/ports/servoshell/webdriver.rs
@@ -142,7 +142,7 @@ impl RunningAppState {
                     let _ = sender.send(());
                 },
                 WebDriverCommandMsg::Shutdown => {
-                    self.servo().start_shutting_down();
+                    self.schedule_exit();
                 },
                 WebDriverCommandMsg::IsWebViewOpen(webview_id, sender) => {
                     let context = self.webview_by_id(webview_id);