diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 028460926..be119f2ff 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -32,6 +32,7 @@
 - fix(zoom) multiplication overflow with zoom calculations on 16-bit platforms
 - feat(msgbox): omit title label unless needed
 - feat(msgbox): add function to get selected button index
+- fix(btnmatrix): make ORed values work correctly with lv_btnmatrix_has_btn_ctrl
 
 ## v8.0.2 (16.07.2021)
 - fix(theme) improve button focus of keyboard
diff --git a/src/widgets/lv_btnmatrix.c b/src/widgets/lv_btnmatrix.c
index 36fac1d39..ab0bedcc6 100644
--- a/src/widgets/lv_btnmatrix.c
+++ b/src/widgets/lv_btnmatrix.c
@@ -331,7 +331,7 @@ bool lv_btnmatrix_has_btn_ctrl(lv_obj_t * obj, uint16_t btn_id, lv_btnmatrix_ctr
     lv_btnmatrix_t * btnm = (lv_btnmatrix_t *)obj;;
     if(btn_id >= btnm->btn_cnt) return false;
 
-    return (btnm->ctrl_bits[btn_id] & ctrl) ? true : false;
+    return ((btnm->ctrl_bits[btn_id] & ctrl) == ctrl) ? true : false;
 }
 
 bool lv_btnmatrix_get_one_checked(const lv_obj_t * obj)