diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index dfc8fd7f90..1286855307 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -12289,13 +12289,15 @@ async fn test_autosave_with_dirty_buffers(cx: &mut TestAppContext) {
     });
 
     let editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
+        let mut editor = Editor::new(
             EditorMode::full(),
             multi_buffer,
             Some(project.clone()),
             window,
             cx,
-        )
+        );
+        editor.set_style(EditorStyle::default(), window, cx);
+        editor
     });
 
     // Edit only the first buffer
@@ -12387,6 +12389,49 @@ async fn test_autosave_with_dirty_buffers(cx: &mut TestAppContext) {
         0,
         "Buffer 3 should not have been written at all"
     );
+
+    cx.update(|_, cx| {
+        SettingsStore::update_global(cx, |store, cx| {
+            store.update_user_settings(cx, |settings| {
+                settings.workspace.autosave = Some(settings::AutosaveSetting::OnFocusChange);
+            });
+        });
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(
+            SelectionEffects::scroll(Autoscroll::Next),
+            window,
+            cx,
+            |s| s.select_ranges(Some(MultiBufferOffset(10)..MultiBufferOffset(10))),
+        );
+        editor.insert("// edited", window, cx);
+    });
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+    dbg!(fs.write_count_for_path(path!("/dir/file1.rs")));
+    dbg!(fs.write_count_for_path(path!("/dir/file2.rs")));
+    dbg!(fs.write_count_for_path(path!("/dir/file3.rs")));
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.open_context_menu(&OpenContextMenu, window, cx);
+    });
+    cx.condition(&editor, |editor, _| editor.mouse_context_menu.is_some())
+        .await;
+    editor.update_in(cx, |editor, window, cx| {
+        window.focus(
+            &editor
+                .mouse_context_menu
+                .as_ref()
+                .unwrap()
+                .context_menu
+                .focus_handle(cx),
+        );
+    });
+    cx.executor().advance_clock(Duration::from_millis(2000));
+    cx.run_until_parked();
+    // assert!(!cx.read(|cx| editor.is_dirty(cx)));
+    dbg!(fs.write_count_for_path(path!("/dir/file1.rs")));
+    dbg!(fs.write_count_for_path(path!("/dir/file2.rs")));
+    dbg!(fs.write_count_for_path(path!("/dir/file3.rs")));
 }
 
 async fn setup_range_format_test(
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 42eb754c21..673cecc9e0 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -880,6 +880,7 @@ impl<T: Item> ItemHandle for Entity<T> {
                 &self.read(cx).focus_handle(cx),
                 window,
                 move |workspace, window, cx| {
+                    dbg!("???");
                     if let Some(item) = weak_item.upgrade()
                         && item.workspace_settings(cx).autosave == AutosaveSetting::OnFocusChange
                     {