diff --git a/boot_diags/src/components/results.rs b/boot_diags/src/components/results.rs
index 759f8c3..f99fcab 100644
--- a/boot_diags/src/components/results.rs
+++ b/boot_diags/src/components/results.rs
@@ -84,6 +84,8 @@ impl Component for Results {
             }
             Action::SetMode(mode) => {
                 self.show = mode == Mode::BootDiags;
+                self.key_index = 0;
+                self.line_index = 0;
             }
             _ => {}
         };