diff --git a/src/steps/emacs.rs b/src/steps/emacs.rs
index 862ff16d..75ab817b 100644
--- a/src/steps/emacs.rs
+++ b/src/steps/emacs.rs
@@ -67,25 +67,24 @@ impl Emacs {
         print_separator("Doom Emacs");
 
         let mut command = ctx.run_type().execute(doom);
-        command.args(&["-y", "upgrade"]);
-
         if ctx.config().yes(Step::Emacs) {
             command.arg("--force");
         }
 
+        command.args(&["upgrade"]);
+
         command.check_run()
     }
 
     pub fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> {
         let emacs = require("emacs")?;
+        if let Some(doom) = &self.doom {
+            Emacs::update_doom(doom, ctx)?;
+        }
         let init_file = require_option(self.directory.as_ref(), String::from("Emacs directory does not exist"))?
             .join("init.el")
             .require()?;
 
-        if let Some(doom) = &self.doom {
-            return Emacs::update_doom(doom, ctx);
-        }
-
         print_separator("Emacs");
 
         let mut command = ctx.run_type().execute(&emacs);