diff --git a/src/infos.rs b/src/infos.rs
index 91ba69e..a378761 100644
--- a/src/infos.rs
+++ b/src/infos.rs
@@ -20,8 +20,8 @@ pub enum CommandErrors {
     NoIwad,
 }
 
-impl CommandManager {
-    pub fn new() -> Self {
+impl Default for CommandManager {
+    fn default() -> Self {
         Self {
             launcher: None,
             iwad: None,
@@ -33,6 +33,9 @@ impl CommandManager {
             command_string: "".to_string(),
         }
     }
+}
+
+impl CommandManager {
     pub fn remove_iwad(&mut self) {
         self.iwad = None;
         self.update_command();
diff --git a/src/main.rs b/src/main.rs
index fb49d84..055bf68 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -52,7 +52,7 @@ impl Default for RustDoomLauncher {
             launcher_manager: SingleManager::new(),
             iwad_manager: SingleManager::new(),
             pwad_manager: MultiManager::new(),
-            command_manager: CommandManager::new(),
+            command_manager: CommandManager::default(),
             add_name: "".to_string(),
             config_filename: default_save_filename(),
             config_file_loaded: false,
@@ -399,9 +399,8 @@ impl eframe::App for RustDoomLauncher {
                 });
         }
 
-        egui::Window::new("Add WAD or Launcher")
-            .open(&mut self.add_stuff_window_displayed)
-            .show(ctx, |ui| {
+        if self.add_stuff_window_displayed {
+            egui::Window::new("Add WAD or Launcher").show(ctx, |ui| {
                 ui.horizontal(|ui| {
                     let name_label = ui.label("Name");
                     ui.text_edit_singleline(&mut self.add_name)
@@ -478,5 +477,6 @@ impl eframe::App for RustDoomLauncher {
                     }
                 }
             });
+        }
     }
 }