Fixed 'show/hide' behavior