diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 7285eceb7..48a1e4be6 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -894,7 +894,11 @@ class _EntityFilter extends StatelessWidget {
                                   border: relatedTypes[i] == routeEntityType
                                       ? Border(
                                           bottom: BorderSide(
-                                            color: state.accentColor,
+                                            color: state.prefState
+                                                        .enableDarkMode ||
+                                                    !state.hasAccentColor
+                                                ? state.accentColor
+                                                : Colors.white,
                                             width: 2,
                                           ),
                                         )
diff --git a/lib/utils/dialogs.dart b/lib/utils/dialogs.dart
index 2ee99a914..a8fecfc9a 100644
--- a/lib/utils/dialogs.dart
+++ b/lib/utils/dialogs.dart
@@ -144,6 +144,7 @@ class _PasswordConfirmationState extends State<PasswordConfirmation> {
     return AlertDialog(
       title: Text(localization.verifyPassword),
       content: TextField(
+        autofocus: true,
         onChanged: (value) => _password = value,
         obscureText: _isPasswordObscured,
         keyboardType: TextInputType.visiblePassword,