LPS-42188 - Prevent input fields overlapping