Improve native cursor behaviour