diff --git a/ports/servoshell/desktop/app_state.rs b/ports/servoshell/desktop/app_state.rs
index e504e9b7658..88abee07a58 100644
--- a/ports/servoshell/desktop/app_state.rs
+++ b/ports/servoshell/desktop/app_state.rs
@@ -240,8 +240,10 @@ impl RunningAppState {
 
         inner.webviews.retain(|&id, _| id != webview_id);
         inner.creation_order.retain(|&id| id != webview_id);
-        inner.focused_webview_id = None;
         inner.dialogs.remove(&webview_id);
+        if Some(webview_id) == inner.focused_webview_id {
+            inner.focused_webview_id = None;
+        }
 
         let last_created = inner
             .creation_order