Fix drawer item duplicate selection problem