1 files changed, 7 insertions, 8 deletions
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index d1f3fc98c7d..20e473b88c9 100644
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -70,16 +70,15 @@ impl HTMLSelectElement {
             }
         }
 
-        if last_selected.is_none() {
-            if self.display_size() == 1 {
-                // select the first enabled element
-                if let Some(first_opt) = first_enabled {
-                    first_opt.set_selectedness(true);
+        match last_selected {
+            Some(last_selected) => last_selected.set_selectedness(true),
+            None => {
+                if self.display_size() == 1 {
+                    if let Some(first_enabled) = first_enabled {
+                        first_enabled.set_selectedness(true);
+                    }
                 }
             }
-        } else {
-            // >= 1 selected, reselect last one
-            last_selected.unwrap().set_selectedness(true);
         }
     }