Cleanup of auto add with tab button