Improved "keep input"-behaviour