diff --git a/lib/galaxy/selenium/navigation.yml b/lib/galaxy/selenium/navigation.yml
index dd357939133..a4999e42472 100644
--- a/lib/galaxy/selenium/navigation.yml
+++ b/lib/galaxy/selenium/navigation.yml
@@ -85,7 +85,7 @@ toolbox_filters:
   selectors:
     input:
       type: xpath
-      selector: "//span[contains(., '${description}')]/../div/div[contains(@class, 'custom-control')]"
+      selector: "//span[contains(., '${description}')]/../div/div/label[@class='custom-control-label']"
     submit: '#submit'
 
 change_user_email:
diff --git a/test/integration_selenium/test_toolbox_filters.py b/test/integration_selenium/test_toolbox_filters.py
index 11557783cf8..4c3286d23c5 100644
--- a/test/integration_selenium/test_toolbox_filters.py
+++ b/test/integration_selenium/test_toolbox_filters.py
@@ -30,7 +30,6 @@ class ToolboxFiltersSeleniumIntegrationTestCase(SeleniumIntegrationTestCase):
         self.action_chains().move_to_element(section).click().perform()
         self.navigate_to_user_preferences()
         self.components.preferences.toolbox_filters.wait_for_and_click()
-        self.sleep_for(self.wait_types.UX_RENDER)
         self.screenshot("toolbox_filters_landing")
         sibling_text = 'This tool filter will disable the Test Section section.'
         component = self.components.toolbox_filters.input(description=sibling_text)