Fix Bug: Click everywhere to Save