diff --git a/superset/security.py b/superset/security.py
index 8ea91b941561e..e342b034d99cc 100644
--- a/superset/security.py
+++ b/superset/security.py
@@ -349,9 +349,14 @@ def is_gamma_pvm(self, pvm):
                     self.is_alpha_only(pvm))
 
     def is_sql_lab_pvm(self, pvm):
-        return pvm.view_menu.name in {'SQL Lab'} or pvm.permission.name in {
-            'can_sql_json', 'can_csv', 'can_search_queries',
-        }
+        return (
+            pvm.view_menu.name in {
+                'SQL Lab', 'SQL Editor', 'Query Search', 'Saved Queries',
+            } or
+            pvm.permission.name in {
+                'can_sql_json', 'can_csv', 'can_search_queries', 'can_sqllab_viz',
+                'can_sqllab',
+            })
 
     def is_granter_pvm(self, pvm):
         return pvm.permission.name in {