diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt
index 8dfb3f4..df19d78 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt
@@ -187,22 +187,28 @@ fun MainView(
                   }
                 },
                 trailingContent = {
-                  Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) {
-                    when (user) {
-                      null -> SettingsButton { navigation.onNavigateToSettings() }
-                      else ->
-                          Box(
-                              contentAlignment = Alignment.Center,
-                              modifier =
-                                  Modifier.size(42.dp).clip(CircleShape).clickable {
-                                    navigation.onNavigateToSettings()
-                                  }) {
-                                Avatar(profile = user, size = 36) {
-                                  navigation.onNavigateToSettings()
-                                }
-                              }
-                    }
-                  }
+                  Box(
+                      modifier =
+                          Modifier.weight(1f)
+                              .focusable()
+                              .clickable { navigation.onNavigateToSettings() }
+                              .padding(8.dp), 
+                      contentAlignment = Alignment.CenterEnd) {
+                        when (user) {
+                          null -> SettingsButton { navigation.onNavigateToSettings() }
+                          else ->
+                              Box(
+                                  contentAlignment = Alignment.Center,
+                                  modifier =
+                                      Modifier.size(42.dp).clip(CircleShape).focusable().clickable {
+                                        navigation.onNavigateToSettings()
+                                      }) {
+                                    Avatar(profile = user, size = 36) {
+                                      navigation.onNavigateToSettings()
+                                    }
+                                  }
+                        }
+                      }
                 })
 
             when (state) {