diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ThemeChooserPreference.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ThemeChooserPreference.kt
index d2ef58f50..8c489a364 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ThemeChooserPreference.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ThemeChooserPreference.kt
@@ -10,7 +10,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewTreeObserver
 import android.widget.HorizontalScrollView
-import android.widget.LinearLayout
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.view.isVisible
 import androidx.customview.view.AbsSavedState
@@ -19,7 +18,9 @@ import androidx.preference.PreferenceViewHolder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.ColorScheme
 import org.koitharu.kotatsu.databinding.ItemColorSchemeBinding
+import org.koitharu.kotatsu.databinding.PreferenceThemeBinding
 import java.lang.ref.WeakReference
+import com.google.android.material.R as materialR
 
 class ThemeChooserPreference @JvmOverloads constructor(
 	context: Context,
@@ -43,38 +44,44 @@ class ThemeChooserPreference @JvmOverloads constructor(
 
 	override fun onBindViewHolder(holder: PreferenceViewHolder) {
 		super.onBindViewHolder(holder)
-		val layout = holder.findViewById(R.id.linear) as? LinearLayout ?: return
-		val scrollView = holder.findViewById(R.id.scrollView) as? HorizontalScrollView ?: return
+		val binding = PreferenceThemeBinding.bind(holder.itemView)
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			scrollView.suppressLayout(true)
-			layout.suppressLayout(true)
+			binding.scrollView.suppressLayout(true)
+			binding.linear.suppressLayout(true)
 		}
-		layout.removeAllViews()
+		binding.linear.removeAllViews()
 		for (theme in entries) {
 			val context = ContextThemeWrapper(context, theme.styleResId)
-			val item = ItemColorSchemeBinding.inflate(LayoutInflater.from(context), layout, false)
-			item.card.isChecked = theme == currentValue
+			val item = ItemColorSchemeBinding.inflate(LayoutInflater.from(context), binding.linear, false)
+			val isSelected = theme == currentValue
+			item.card.isChecked = isSelected
+			item.card.strokeWidth = if (isSelected) context.resources.getDimensionPixelSize(
+				materialR.dimen.m3_comp_outlined_card_outline_width,
+			) else 0
 			item.textViewTitle.setText(theme.titleResId)
 			item.root.tag = theme
 			item.card.tag = theme
 			item.imageViewCheck.isVisible = theme == currentValue
 			item.root.setOnClickListener(itemClickListener)
 			item.card.setOnClickListener(itemClickListener)
-			layout.addView(item.root)
+			binding.linear.addView(item.root)
+			if (isSelected) {
+				item.root.requestFocus()
+			}
 		}
 		if (lastScrollPosition[0] >= 0) {
-			val scroller = Scroller(scrollView, lastScrollPosition[0])
+			val scroller = Scroller(binding.scrollView, lastScrollPosition[0])
 			scroller.run()
-			scrollView.post(scroller)
+			binding.scrollView.post(scroller)
 		}
-		scrollView.viewTreeObserver.run {
+		binding.scrollView.viewTreeObserver.run {
 			scrollPersistListener?.let { removeOnScrollChangedListener(it) }
-			scrollPersistListener = ScrollPersistListener(WeakReference(scrollView), lastScrollPosition)
+			scrollPersistListener = ScrollPersistListener(WeakReference(binding.scrollView), lastScrollPosition)
 			addOnScrollChangedListener(scrollPersistListener)
 		}
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			layout.suppressLayout(false)
-			scrollView.suppressLayout(false)
+			binding.linear.suppressLayout(false)
+			binding.scrollView.suppressLayout(false)
 		}
 	}
 
diff --git a/app/src/main/res/layout/item_color_scheme.xml b/app/src/main/res/layout/item_color_scheme.xml
index 58ec38333..d6f325151 100644
--- a/app/src/main/res/layout/item_color_scheme.xml
+++ b/app/src/main/res/layout/item_color_scheme.xml
@@ -15,7 +15,8 @@
 		style="?materialCardViewFilledStyle"
 		android:layout_width="@dimen/widget_cover_width"
 		android:layout_height="@dimen/widget_cover_height"
-		android:focusableInTouchMode="false">
+		android:focusableInTouchMode="false"
+		app:strokeColor="?colorOutline">
 
 		<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/preference_theme.xml b/app/src/main/res/layout/preference_theme.xml
index ef3586ff9..643e20b39 100644
--- a/app/src/main/res/layout/preference_theme.xml
+++ b/app/src/main/res/layout/preference_theme.xml
@@ -60,6 +60,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="2dp"
 			android:clipToPadding="false"
+			android:descendantFocusability="blocksDescendants"
 			android:paddingStart="0dp"
 			android:paddingEnd="16dp"
 			android:scrollbars="none"