Issue 1396 - Just check whether the element is already hidden instead using a custom property