diff --git a/src/config.rs b/src/config.rs
index a3b136a..8402b35 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -134,7 +134,7 @@ impl ConfigFile {
 
             let default_config = (&*globals::CONFIG_NAME.read().unwrap()).to_string();
             let config_name =
-                if map.len() > 1 && map.len() != 0 || !map.contains_key(&default_config) {
+                if (map.len() > 1 || !map.contains_key(&default_config)) && map.len() != 0 {
                     ConfigPicker::new(map.keys().map(|a| a.to_owned()).collect())
                         .selected()
                         .unwrap_or(default_config)
diff --git a/src/main_window.rs b/src/main_window.rs
index 656560c..833f548 100644
--- a/src/main_window.rs
+++ b/src/main_window.rs
@@ -390,6 +390,7 @@ impl MainWindow {
                 chooser.set_option(fltk::dialog::FileDialogOptions::NewFolder);
                 chooser.show();
                 let path = chooser.filename();
+                let path = fs::canonicalize(&path).unwrap_or(path);
                 if !path.exists() {
                     return;
                 }