Code clean up, after merge. Reset state of Enable button after skin
change