diff --git a/src/main.rs b/src/main.rs
index 2278493..eb24d61 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@ use cosmic::{
     Application, ApplicationExt, Apply, Element,
 };
 use cosmic_files::{
-    dialog::{Dialog, DialogKind, DialogMessage, DialogResult},
+    dialog::{Dialog, DialogKind, DialogMessage, DialogResult, DialogSettings},
     mime_icon::{mime_for_path, mime_icon},
 };
 use cosmic_text::{Cursor, Edit, Family, Selection, SwashCache, SyntaxSystem, ViMode};
@@ -2090,8 +2090,7 @@ impl Application for App {
             Message::OpenFileDialog => {
                 if self.dialog_opt.is_none() {
                     let (dialog, command) = Dialog::new(
-                        DialogKind::OpenMultipleFiles,
-                        None,
+                        DialogSettings::new().kind(DialogKind::OpenMultipleFiles),
                         Message::DialogMessage,
                         Message::OpenFileResult,
                     );
@@ -2164,8 +2163,7 @@ impl Application for App {
             Message::OpenProjectDialog => {
                 if self.dialog_opt.is_none() {
                     let (dialog, command) = Dialog::new(
-                        DialogKind::OpenMultipleFolders,
-                        None,
+                        DialogSettings::new().kind(DialogKind::OpenMultipleFolders),
                         Message::DialogMessage,
                         Message::OpenProjectResult,
                     );
@@ -2390,12 +2388,15 @@ impl Application for App {
                             ),
                             None => (String::new(), None),
                         };
-                        let (dialog, command) = Dialog::new(
-                            DialogKind::SaveFile { filename },
-                            path_opt,
-                            Message::DialogMessage,
-                            move |result| Message::SaveAsResult(entity, result),
-                        );
+                        let mut settings =
+                            DialogSettings::new().kind(DialogKind::SaveFile { filename });
+                        if let Some(path) = path_opt {
+                            settings = settings.path(path);
+                        }
+                        let (dialog, command) =
+                            Dialog::new(settings, Message::DialogMessage, move |result| {
+                                Message::SaveAsResult(entity, result)
+                            });
                         self.dialog_opt = Some(dialog);
                         return command;
                     }
diff --git a/src/menu.rs b/src/menu.rs
index 3cc7cbf..3f7b225 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -9,7 +9,7 @@ use cosmic::{
     theme,
     widget::{
         self, divider, horizontal_space,
-        menu::{menu_button, ItemHeight, ItemWidth, MenuBar, Tree as MenuTree},
+        menu::{menu_button, ItemHeight, ItemWidth},
         responsive_menu_bar, segmented_button,
     },
     Element,