Shift click improved for genericContainer