diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
index c94aa166..98bbf08f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
@@ -1,9 +1,7 @@
 package com.lagradost.cloudstream3.ui.account
 
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.annotation.RequiresApi
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.databinding.AccountListItemBinding
@@ -27,9 +25,8 @@ class AccountAdapter(
             binding.lockIcon.isVisible = account.lockPin != null
             binding.outline.isVisible = isLastUsedAccount
 
-            @RequiresApi(Build.VERSION_CODES.O)
-            if (isTvSettings()) {
-                binding.root.isFocusedByDefault = isLastUsedAccount
+            if (isTvSettings() && isLastUsedAccount) {
+                binding.root.requestFocus()
             }
 
             binding.root.setOnClickListener {
@@ -61,4 +58,4 @@ class AccountAdapter(
     override fun getItemCount(): Int {
         return accounts.size
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 28777206..5f7e2916 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -71,4 +71,4 @@ class AccountSelectActivity : AppCompatActivity() {
         startActivity(mainIntent)
         finish() // Finish the account selection activity
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml
index 33b52fd4..3331b85b 100644
--- a/app/src/main/res/layout/account_list_item.xml
+++ b/app/src/main/res/layout/account_list_item.xml
@@ -52,4 +52,5 @@
             android:gravity="center"
             android:padding="10dp"
             android:textSize="16sp" />
+
     </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index 192ff984..72f959d2 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/black"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,5 +25,4 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp" />
 
-</LinearLayout>
-
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account_select_tv.xml b/app/src/main/res/layout/activity_account_select_tv.xml
index 349c8c5e..8d32944e 100644
--- a/app/src/main/res/layout/activity_account_select_tv.xml
+++ b/app/src/main/res/layout/activity_account_select_tv.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/black"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/lock_pin_dialog.xml b/app/src/main/res/layout/lock_pin_dialog.xml
index c69ff21a..db2af48e 100644
--- a/app/src/main/res/layout/lock_pin_dialog.xml
+++ b/app/src/main/res/layout/lock_pin_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -22,4 +22,4 @@
         android:layout_marginTop="8dp"
         android:visibility="gone" />
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file