GRAS-1132 Added rivets binder to handle enter click