diff --git a/rust/src/firefox.rs b/rust/src/firefox.rs
index dd8ffd557153e..19b9f4b3b014d 100644
--- a/rust/src/firefox.rs
+++ b/rust/src/firefox.rs
@@ -130,7 +130,19 @@ impl SeleniumManager for FirefoxManager {
     }
 
     fn get_browser_names_in_path(&self) -> Vec<&str> {
-        vec![self.get_browser_name()]
+        let browser_version = self.get_browser_version();
+        let mut browser_names = vec![];
+        if self.is_beta(browser_version) {
+            browser_names.push("firefox-beta");
+        } else if self.is_dev(browser_version) {
+            browser_names.push("firefox-devedition");
+        } else if self.is_nightly(browser_version) {
+            browser_names.push("firefox-trunk");
+        } else if self.is_esr(browser_version) {
+            browser_names.push("firefox-esr");
+        }
+        browser_names.push(self.get_browser_name());
+        browser_names
     }
 
     fn get_http_client(&self) -> &Client {
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 556c8af1fb967..2186054c409b3 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -568,6 +568,9 @@ pub trait SeleniumManager {
                                         discovered_major_browser_version,
                                     ));
                                     download_browser = true;
+                                    if self.is_avoid_browser_download() {
+                                        self.set_browser_version(discovered_major_browser_version);
+                                    }
                                 }
                             } else {
                                 self.set_browser_version(discovered_version);