diff -Nuar xserver-xorg-input-synaptics-1.8.1/src/synaptics.c xserver-xorg-input-synaptics-1.8.1.new/src/synaptics.c
--- xserver-xorg-input-synaptics-1.8.1/src/synaptics.c	2014-10-03 16:34:45.000000000 +0300
+++ xserver-xorg-input-synaptics-1.8.1.new/src/synaptics.c	2014-10-03 16:15:33.792698024 +0300
@@ -2419,8 +2419,7 @@
     SynapticsParameters *para = &priv->synpara;
     int delay = 1000000000;
 
-    if (priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF ||
-        priv->synpara.touchpad_off == TOUCHPAD_OFF ||
+    if ((priv->synpara.touchpad_off == TOUCHPAD_OFF && !para->clickpad) ||
         priv->finger_state == FS_BLOCKED) {
         stop_coasting(priv);
         priv->circ_scroll_on = FALSE;