diff --git a/LDK/api-src/org/labkey/api/ldk/table/SimpleButtonConfigFactory.java b/LDK/api-src/org/labkey/api/ldk/table/SimpleButtonConfigFactory.java
index 9e6b332a..2ef837de 100644
--- a/LDK/api-src/org/labkey/api/ldk/table/SimpleButtonConfigFactory.java
+++ b/LDK/api-src/org/labkey/api/ldk/table/SimpleButtonConfigFactory.java
@@ -125,7 +125,17 @@ protected String getJsHandler(TableInfo ti)
     @Override
     public boolean isAvailable(TableInfo ti)
     {
-        return _owner == null || ti.getUserSchema().getContainer().getActiveModules().contains(_owner);
+        if (_owner != null && !ti.getUserSchema().getContainer().getActiveModules().contains(_owner))
+        {
+            return false;
+        }
+
+        if (_permission != null && !ti.getUserSchema().getContainer().hasPermission(ti.getUserSchema().getUser(), _permission))
+        {
+            return false;
+        }
+
+        return true;
     }
 
     @Override
diff --git a/LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java b/LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java
index 2b16fa5b..fab0c124 100644
--- a/LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java
+++ b/LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java
@@ -469,6 +469,11 @@ private static boolean configureMoreActionsBtn(TableInfo ti, List<ButtonConfigFa
         for (ButtonConfigFactory fact : buttons)
         {
             NavTree newButton = fact.create(ti);
+            if (!fact.isAvailable(ti) || !fact.isVisible(ti))
+            {
+                continue;
+            }
+
             if (!btnNameMap.containsKey(newButton.getText()))
             {
                 btnNameMap.put(newButton.getText(), newButton);
diff --git a/LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java b/LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java
index e51aa912..e367882e 100644
--- a/LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java
+++ b/LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java
@@ -240,6 +240,8 @@ public void testSteps() throws Exception
         urlGenerationTest();
         peptideTableTest();
         searchPanelTest();
+
+        testButtonPermissions();
     }
 
     protected void setUpTest() throws Exception
@@ -1877,4 +1879,25 @@ public void checkViews()
         //the module contains an R report tied to a specific assay name, so view check fails when an assay of that name isnt present
         //when module-based assays can supply reports this should be corrected
     }
+
+    protected void testButtonPermissions() throws Exception
+    {
+        goToProjectHome();
+        _helper.clickNavPanelItem("Samples:", "Browse All");
+
+        DataRegionTable dr = new DataRegionTable("query", this);
+        dr.checkAllOnPage();
+
+        dr.clickHeaderButton("More Actions");
+        assertElementPresent(Locator.tagWithText("a", "Bulk Edit"));
+
+        impersonateRole("Editor");
+        refresh();
+
+        dr = new DataRegionTable("query", this);
+        dr.checkAllOnPage();
+
+        dr.clickHeaderButton("More Actions");
+        assertElementNotPresent(Locator.tagWithText("a", "Bulk Edit"));
+    }
 }