diff --git a/Common/UI/UIScreen.cpp b/Common/UI/UIScreen.cpp
index 15215148af..2df6ea2bf5 100644
--- a/Common/UI/UIScreen.cpp
+++ b/Common/UI/UIScreen.cpp
@@ -822,6 +822,12 @@ void AbstractChoiceWithValueDisplay::Draw(UIContext &dc) {
 	if (!IsEnabled()) {
 		style = dc.theme->itemDisabledStyle;
 	}
+	if (HasFocus()) {
+		style = dc.theme->itemFocusedStyle;
+	}
+	if (down_) {
+		style = dc.theme->itemDownStyle;
+	}
 	int paddingX = 12;
 	dc.SetFontStyle(dc.theme->uiFont);
 
diff --git a/Common/UI/View.cpp b/Common/UI/View.cpp
index 03459a296c..9df5e38286 100644
--- a/Common/UI/View.cpp
+++ b/Common/UI/View.cpp
@@ -687,8 +687,15 @@ EventReturn CheckBox::OnClicked(EventParams &e) {
 
 void CheckBox::Draw(UIContext &dc) {
 	Style style = dc.theme->itemStyle;
-	if (!IsEnabled())
+	if (!IsEnabled()) {
 		style = dc.theme->itemDisabledStyle;
+	}
+	if (HasFocus()) {
+		style = dc.theme->itemFocusedStyle;
+	}
+	if (down_) {
+		style = dc.theme->itemDownStyle;
+	}
 	dc.SetFontStyle(dc.theme->uiFont);
 
 	ClickableItem::Draw(dc);