diff --git a/src/hidpp20.c b/src/hidpp20.c
index 690a3f75..35e5441b 100644
--- a/src/hidpp20.c
+++ b/src/hidpp20.c
@@ -1476,8 +1476,8 @@ hidpp20_onboard_profiles_allocate(struct hidpp20_device *device,
 	profiles->num_buttons = min(info.button_count, 16);
 	profiles->num_modes = HIDPP20_DPI_COUNT;
 	profiles->num_leds = HIDPP20_LED_COUNT;
-	profiles->has_g_shift = (info.mechanical_layout & 0x03) == 2;
-	profiles->has_dpi_shift = ((info.mechanical_layout & 0x0c) >> 2) == 2;
+	profiles->has_g_shift = (info.mechanical_layout & 0x03) == 0x02;
+	profiles->has_dpi_shift = ((info.mechanical_layout & 0x0c) >> 2) == 0x02;
 	switch(info.various_info & 0x07) {
 	case 1:
 		profiles->corded = 1;