Quick fix of long click bug in new layout, possibly improve later