diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6b08e2be0..21c8828676 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Use fluent for translations
+- First tab on Login screen triggers username focus
 
 ### Removed
 
diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index 12c5d2ded4..f68ffabafc 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -501,6 +501,9 @@ impl Controls {
                 screen.banner.server = text_input::State::new();
                 screen.banner.username = text_input::State::focused();
                 screen.banner.username.move_cursor_to_end();
+            } else {
+                screen.banner.username = text_input::State::focused();
+                screen.banner.username.move_cursor_to_end();
             }
         }
     }