fix for Prevent on Selection Drawer