Update selection detection for buttons
Update selection detection for buttons