diff --git a/src/ui/map_select.rs b/src/ui/map_select.rs
index 78228c84a..56703719b 100644
--- a/src/ui/map_select.rs
+++ b/src/ui/map_select.rs
@@ -81,6 +81,10 @@ pub fn map_select_menu(
                                     .show(ui)
                                     .focus_by_default(ui);
 
+                                    if all_maps_button.has_focus() {
+                                        all_maps_button.scroll_to_me(None);
+                                    }
+
                                     if all_maps_button.clicked() {
                                         // TODO: Currently does not include packs, only stable maps.
                                         let mut map_pool =
@@ -98,6 +102,10 @@ pub fn map_select_menu(
                                         )
                                         .show(ui);
 
+                                        if button.has_focus() {
+                                            button.scroll_to_me(None);
+                                        }
+
                                         if button.clicked() {
                                             return MapSelectAction::SelectMap(
                                                 MapPool::from_single_map(*handle),
@@ -116,6 +124,10 @@ pub fn map_select_menu(
                                             )
                                             .show(ui);
 
+                                            if button.has_focus() {
+                                                button.scroll_to_me(None);
+                                            }
+
                                             if button.clicked() {
                                                 return MapSelectAction::SelectMap(
                                                     MapPool::from_single_map(*map),