MatchDMIModalias=dmi:*svnMicrosoftCorporation:pnSurface3:*
AttrLidSwitchReliability=write_open
-[Microsoft Surface 3 Type Cover Keyboard]
-MatchName=*Microsoft Surface Type Cover Keyboard*
-MatchDMIModalias=dmi:*svnMicrosoftCorporation:pnSurface3:*
+# Matches both Surface Laptop keyboards as well as type covers.
+# i.e.
+# - Surface 3: Microsoft Surface 3 Type Cover Keyboard
+# - Surface Laptop 3: Microsoft Surface 045E:09AE Keyboard
+# - Surface Book 2: Microsoft Surface Keyboard
+[Microsoft Surface Keyboard]
+MatchName=*Microsoft Surface *Keyboard*
+MatchDMIModalias=dmi:*svnMicrosoftCorporation:*
AttrKeyboardIntegration=internal
[Microsoft Nano Transceiver v2.0]