Popover menu doesn't work without a refresh

Applied patch from https://www.drupal.org/files/issues/2023-03-28/lb_direct_add-3350807-4.patch. Minor code cleanup.

Closes #3350807