diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c
index a8ff37ed..e4e465a6 100644
--- a/src/evdev-mt-touchpad-gestures.c
+++ b/src/evdev-mt-touchpad-gestures.c
@@ -330,19 +330,20 @@ tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time)
 
 	/* for two-finger gestures, if the fingers stay unmoving for a
 	 * while, assume (slow) scroll */
-	if (tp->gesture.finger_count == 2 &&
-	    time > (tp->gesture.initial_time + DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT)) {
-		tp_gesture_set_scroll_buildup(tp);
-		return GESTURE_STATE_SCROLL;
-	}
+	if (tp->gesture.finger_count == 2) {
+		if (time > (tp->gesture.initial_time + DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT)) {
+			tp_gesture_set_scroll_buildup(tp);
+			return GESTURE_STATE_SCROLL;
+		}
 
-	/* Else check if one finger is > 20mm below the others */
-	vert_distance = abs(first->point.y - second->point.y);
-	if (vert_distance > 20 * yres &&
-	    tp->gesture.finger_count > 2 &&
-	    tp->gesture.enabled) {
-		tp_gesture_init_pinch(tp);
-		return GESTURE_STATE_PINCH;
+		/* Else check if one finger is > 20mm below the others */
+		vert_distance = abs(first->point.y - second->point.y);
+		if (vert_distance > 20 * yres &&
+		    tp->gesture.finger_count > 2 &&
+		    tp->gesture.enabled) {
+			tp_gesture_init_pinch(tp);
+			return GESTURE_STATE_PINCH;
+		}
 	}
 
 	/* Else wait for both fingers to have moved */