diff --git a/src/org/labkey/test/tests/CustomizeViewTest.java b/src/org/labkey/test/tests/CustomizeViewTest.java
index fb4384de1d..db679bfe3b 100644
--- a/src/org/labkey/test/tests/CustomizeViewTest.java
+++ b/src/org/labkey/test/tests/CustomizeViewTest.java
@@ -303,7 +303,7 @@ public void saveFilterTest()
         FieldKey fieldKey = FieldKey.fromParts(LAST_NAME_COLUMN);
         String op = "Starts With";
         String value = "J";
-        String[] viewNames = {TRICKY_CHARACTERS + "view", "AAC", "aaa", "aad", "zzz"};
+        String[] viewNames = {TRICKY_CHARACTERS + "view", "AAC", "aaa", "aad", "zzz", "view,with,comma"};
 
         setColumns(LAST_NAME_COLUMN);
         for(String name : viewNames)
@@ -311,6 +311,10 @@ public void saveFilterTest()
             _customizeViewsHelper.openCustomizeViewPanel();
             _customizeViewsHelper.addFilter(fieldKey, op, value);
             _customizeViewsHelper.saveCustomView(name);
+            _customizeViewsHelper.openCustomizeViewPanel();
+            // GitHub Issue #936 : ensure custom view can be edited
+            assertElementNotPresent(Locator.tagWithClass("div", "alert-warning").withText(String.format("Custom Grid View '%s' not found.", name)));
+            _customizeViewsHelper.closePanel();
         }
 
         DataRegionTable drt = new DataRegionTable("query", getDriver());