Revert "20:Avoid loosing data while double clicking"

This reverts commit 087c9ff5441603ae2142409f2af1622b155c6b25.
Revert "20:Avoid loosing data while double clicking"

This reverts commit 21b8ce6d914e5a8c0fa26635192e213196b197c1.