Fix for TC-1468. Also enabling buttons to be pressed as a temporary workaround