diff --git a/Cargo.lock b/Cargo.lock
index a50b541..e5395d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,12 +21,12 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 [[package]]
 name = "accesskit"
 version = "0.16.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 
 [[package]]
 name = "accesskit_atspi_common"
 version = "0.9.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -39,7 +39,7 @@ dependencies = [
 [[package]]
 name = "accesskit_consumer"
 version = "0.24.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 dependencies = [
  "accesskit",
  "immutable-chunkmap",
@@ -48,7 +48,7 @@ dependencies = [
 [[package]]
 name = "accesskit_macos"
 version = "0.17.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -61,7 +61,7 @@ dependencies = [
 [[package]]
 name = "accesskit_unix"
 version = "0.12.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 dependencies = [
  "accesskit",
  "accesskit_atspi_common",
@@ -76,7 +76,7 @@ dependencies = [
 [[package]]
 name = "accesskit_windows"
 version = "0.22.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -88,7 +88,7 @@ dependencies = [
 [[package]]
 name = "accesskit_winit"
 version = "0.22.0"
-source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#6050b02771ba9d6e4113902d9dfb7cf41a20573c"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#172e1227d65354a1bbe218303032d4b047ae2a27"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -1160,7 +1160,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1179,7 +1179,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1288,7 +1288,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -2731,7 +2731,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -2749,7 +2749,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2758,7 +2758,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "bitflags 2.6.0",
  "bytes",
@@ -2783,7 +2783,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "futures",
  "iced_core",
@@ -2809,7 +2809,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
@@ -2831,7 +2831,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2843,7 +2843,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "bytes",
  "dnd",
@@ -2859,7 +2859,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -2875,7 +2875,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "as-raw-xcb-connection",
  "bitflags 2.6.0",
@@ -2906,7 +2906,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -2925,7 +2925,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0-dev"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3449,7 +3449,7 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#b44fe2c0b6e881761f2344d2817707725a38f91c"
+source = "git+https://github.com/pop-os/libcosmic.git#cf3ba4ca078bcc5238360a2ff448f80b482f451a"
 dependencies = [
  "apply",
  "ashpd 0.9.2",
diff --git a/src/dialog.rs b/src/dialog.rs
index 1ef4ed5..657498e 100644
--- a/src/dialog.rs
+++ b/src/dialog.rs
@@ -172,7 +172,8 @@ impl<M: Send + 'static> Dialog<M> {
 
         let (window_id, window_command) = window::open(settings.clone());
 
-        let core = Core::default();
+        let mut core = Core::default();
+        core.set_main_window_id(window_id);
         let flags = Flags {
             kind,
             path_opt: path_opt
@@ -191,9 +192,6 @@ impl<M: Send + 'static> Dialog<M> {
 
         // settings here is unused
         let (mut cosmic, cosmic_command) = Cosmic::<App>::init((core, flags, settings));
-        let update_command = cosmic.update(app::Message::Cosmic(
-            app::cosmic::Message::MainWindowCreated(window_id),
-        ));
 
         (
             Self {
@@ -206,9 +204,6 @@ impl<M: Send + 'static> Dialog<M> {
                 cosmic_command
                     .map(DialogMessage)
                     .map(move |message| app::Message::App(mapper(message))),
-                update_command
-                    .map(DialogMessage)
-                    .map(move |message| app::Message::App(mapper(message))),
             ]),
         )
     }