diff --git a/airgun/entities/contentview_new.py b/airgun/entities/contentview_new.py
index 1f9ee38aa..5412cff32 100644
--- a/airgun/entities/contentview_new.py
+++ b/airgun/entities/contentview_new.py
@@ -109,7 +109,7 @@ def delete_version(self, entity_name, version):
         )
         time.sleep(5)  # 'Loading' widget on page
         self.browser.plugin.ensure_page_safe(timeout='10s')
-        wait_for(lambda: view.table.is_displayed, timeout=20)
+        wait_for(lambda: view.repositories.table.is_displayed, timeout=20)
         result = view.version_dropdown.item_select('Delete')
         view.wait_displayed()
         # Remove from environment(s) wizard, if it appears
@@ -369,7 +369,7 @@ class EditContentView(NavigateStep):
 
     def step(self, *args, **kwargs):
         entity_name = kwargs.get('entity_name')
-        self.parent.search.search(entity_name)
+        self.parent.search(entity_name)
         self.parent.table.wait_displayed()
         self.parent.table.row(name=entity_name)['Name'].widget.click()
 
@@ -388,7 +388,6 @@ def step(self, *args, **kwargs):
         self.parent.versions.wait_displayed()
         self.parent.versions.search(version)
         self.parent.versions.table.wait_displayed()
-        self.parent.versions.search(version).click()
         self.parent.versions.table.row(version=version)['Version'].widget.click()
 
 
diff --git a/airgun/views/contentview_new.py b/airgun/views/contentview_new.py
index 67dd9ae26..661c2cadb 100644
--- a/airgun/views/contentview_new.py
+++ b/airgun/views/contentview_new.py
@@ -72,7 +72,6 @@ def is_displayed(self):
 class ContentViewTableView(BaseLoggedInView, SearchableViewMixinPF4):
     title = PF5Text(component_id='cvPageHeaderText')
     create_content_view = PF5Button(component_id='create-content-view')
-    search = PF4Search()
     table = ExpandableTable(
         component_id='content-views-table',
         column_widgets={