diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
index 958cfbdc..e313ad39 100644
--- a/quirks/50-system-lenovo.quirks
+++ b/quirks/50-system-lenovo.quirks
@@ -81,6 +81,14 @@ MatchName=AT Translated Set 2 keyboard
 MatchDMIModalias=dmi:*svnIBM:*pvrThinkPadX41Tablet:*
 ModelTabletModeNoSuspend=1
 
+# Lenovo X220 Tablet special bezel buttons are associated to the
+# keyboard and would therefore mistakenly be deactivated as well.
+# See https://gitlab.freedesktop.org/libinput/libinput/issues/154
+[Lenovo X220 Tablet]
+MatchName=AT Translated Set 2 keyboard
+MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX220Tablet:*
+ModelTabletModeNoSuspend=1
+
 # Lenovo MIIX 720 comes with a detachable keyboard. We must not disable
 # the keyboard because some keys are still accessible on the screen and
 # volume rocker. See