Improved scrollXEnabled conditions