Fixed buggy behavior with the tray item