Changed default enter behavior. Code not DRY