diff --git a/src/org/labkey/test/components/react/MultiMenu.java b/src/org/labkey/test/components/react/MultiMenu.java
index 11a366d20e..e625ee12b7 100644
--- a/src/org/labkey/test/components/react/MultiMenu.java
+++ b/src/org/labkey/test/components/react/MultiMenu.java
@@ -215,6 +215,12 @@ public MultiMenuFinder withButtonId(String id)
             return this;
         }
 
+        public MultiMenuFinder withButtonClass(String cls)
+        {
+            _locator = Locators.menuContainer().withChild(Locator.tagWithClass("button", cls));
+            return this;
+        }
+
         /**
          * Looks for the export button using the fa-download class
          * @return export menu utility
diff --git a/src/org/labkey/test/components/ui/grids/GridBar.java b/src/org/labkey/test/components/ui/grids/GridBar.java
index c842c73907..a03048b4c7 100644
--- a/src/org/labkey/test/components/ui/grids/GridBar.java
+++ b/src/org/labkey/test/components/ui/grids/GridBar.java
@@ -433,11 +433,6 @@ static public Locator.XPathLocator gridBar()
             return Locator.XPathLocator.union(Locator.tagWithClassContaining("div", "query-grid-bar"),
                     Locator.tagWithClassContaining("div", "grid-panel__button-bar"));
         }
-
-        static final Locator.XPathLocator viewSelectorButtonGroup = Locator.tagWithClass("div", "dropdown")
-                .withChild(Locator.button("Grid Views"));
-        static final Locator.XPathLocator viewSelectorToggleButton = Locator.button("Grid Views");
-        static final Locator viewSelectorMenu = Locator.tagWithAttributeContaining("ul", "aria-labelledby", "viewselector");
     }
 
     public static class GridBarFinder extends ComponentFinder<QueryGrid, GridBar, GridBarFinder>
diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java
index 4bd3deba04..05e7a88c42 100644
--- a/src/org/labkey/test/components/ui/grids/QueryGrid.java
+++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java
@@ -15,7 +15,6 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
-import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 
@@ -298,8 +297,13 @@ public QueryGrid clearAllSelections()
     // select view
     public QueryGrid selectView(String viewName)
     {
-        doAndWaitForUpdate(()->
-                getGridBar().doMenuAction("Grid Views", Arrays.asList(viewName)));
+        WebElement viewBtn = Locator.tagWithClass("span", "fa-table").findElement(this);
+        viewBtn.click();
+
+        WebElement viewMenuItem = Locator.tagWithClass("ul", "dropdown-menu")
+                .child(Locator.tagWithText("li", viewName))
+                .findElement(this);
+        doAndWaitForUpdate(viewMenuItem::click);
         return this;
     }