diff --git a/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index 96f1d3a6311..d6aa813cbdb 100644
--- a/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -1,6 +1,6 @@
 import { FC } from 'react'
 import Link from 'next/link'
-import { Badge, Button, IconAlertCircle, Typography } from '@supabase/ui'
+import { Button, IconAlertCircle, IconLock } from '@supabase/ui'
 import { PostgresTable } from '@supabase/postgres-meta'
 import { useStore } from 'hooks'
 
@@ -16,18 +16,13 @@ const GridHeaderActions: FC<Props> = ({ table }) => {
 
   return (
     <div className="space-x-3 flex items-center">
-      {!table.rls_enabled && (
-        <Link href={urlToRLSPolicies}>
-          <Button type="warning" icon={<IconAlertCircle strokeWidth={2} size={14} />}>
-            RLS not enabled
+      <Link href={urlToRLSPolicies}>
+          <Button
+            type={table.rls_enabled ? 'link' : 'warning'}
+            icon={table.rls_enabled ? <IconLock strokeWidth={2} size={14} /> : <IconAlertCircle strokeWidth={2} size={14} />}>
+            RLS {table.rls_enabled ? 'is' : 'not'} enabled
           </Button>
-        </Link>
-      )}
-      {/* <Button type="text">
-        <Typography.Text small code>
-          Shortcuts
-        </Typography.Text>
-      </Button> */}
+      </Link>
     </div>
   )
 }
diff --git a/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx b/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
index 5b8f12db0be..7adaa5c79af 100644
--- a/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
@@ -139,7 +139,7 @@ const TableGridEditor: FC<Props> = ({
         schema={selectedTable.schema}
         table={gridTable}
         headerActions={
-          !isViewSelected && <GridHeaderActions table={selectedTable as PostgresTable} />
+          !isViewSelected && selectedTable.schema === 'public' && <GridHeaderActions table={selectedTable as PostgresTable} />
         }
         onAddColumn={onAddColumn}
         onEditColumn={onSelectEditColumn}