diff --git a/apps/dashboard/app/(app)/[workspaceSlug]/authorization/permissions/components/table/permissions-list.tsx b/apps/dashboard/app/(app)/[workspaceSlug]/authorization/permissions/components/table/permissions-list.tsx
index cf3255f051..136e0b61f8 100644
--- a/apps/dashboard/app/(app)/[workspaceSlug]/authorization/permissions/components/table/permissions-list.tsx
+++ b/apps/dashboard/app/(app)/[workspaceSlug]/authorization/permissions/components/table/permissions-list.tsx
@@ -6,6 +6,7 @@ import { BookBookmark, Page2 } from "@unkey/icons";
 import { Button, Checkbox, Empty } from "@unkey/ui";
 import { cn } from "@unkey/ui/src/lib/utils";
 import { useCallback, useMemo, useState } from "react";
+import { EditPermission } from "./components/actions/components/edit-permission";
 import { PermissionsTableActions } from "./components/actions/keys-table-action.popover.constants";
 import { AssignedItemsCell } from "./components/assigned-items-cell";
 import { LastUpdated } from "./components/last-updated";
@@ -54,7 +55,7 @@ export const PermissionsList = () => {
           const iconContainer = (
             <div
               className={cn(
-                "size-5 rounded flex items-center justify-center cursor-pointer border border-grayA-3 transition-all duration-100",
+                "size-5 rounded flex items-center justify-center border border-grayA-3 transition-all duration-100",
                 "bg-grayA-3",
                 isSelected && "bg-grayA-5",
               )}
@@ -62,12 +63,13 @@ export const PermissionsList = () => {
               onMouseLeave={() => setHoveredPermissionName(null)}
             >
               {!isSelected && !isHovered && (
-                <Page2 iconSize="sm-regular" className="text-gray-12" />
+                <Page2 iconSize="sm-regular" className="text-gray-12 cursor-pointer" />
               )}
               {(isSelected || isHovered) && (
                 <Checkbox
                   checked={isSelected}
                   className="size-4 [&_svg]:size-3"
+                  onClick={(e) => e.stopPropagation()}
                   onCheckedChange={() => toggleSelection(permission.permissionId)}
                 />
               )}
@@ -162,87 +164,96 @@ export const PermissionsList = () => {
   );
 
   return (
-    <VirtualTable
-      data={permissions}
-      isLoading={isLoading}
-      isFetchingNextPage={isLoadingMore}
-      onLoadMore={loadMore}
-      columns={columns}
-      onRowClick={setSelectedPermission}
-      selectedItem={selectedPermission}
-      keyExtractor={(permission) => permission.permissionId}
-      rowClassName={(permission) => getRowClassName(permission, selectedPermission)}
-      loadMoreFooterProps={{
-        hide: isLoading,
-        buttonText: "Load more permissions",
-        hasMore,
-        headerContent: (
-          <SelectionControls
-            selectedPermissions={selectedPermissions}
-            setSelectedPermissions={setSelectedPermissions}
-          />
-        ),
-        countInfoText: (
-          <div className="flex gap-2">
-            <span>Showing</span>{" "}
-            <span className="text-accent-12">
-              {new Intl.NumberFormat().format(permissions.length)}
-            </span>
-            <span>of</span>
-            {new Intl.NumberFormat().format(totalCount)}
-            <span>permissions</span>
+    <>
+      <VirtualTable
+        data={permissions}
+        isLoading={isLoading}
+        isFetchingNextPage={isLoadingMore}
+        onLoadMore={loadMore}
+        columns={columns}
+        onRowClick={setSelectedPermission}
+        selectedItem={selectedPermission}
+        keyExtractor={(permission) => permission.permissionId}
+        rowClassName={(permission) => getRowClassName(permission, selectedPermission)}
+        loadMoreFooterProps={{
+          hide: isLoading,
+          buttonText: "Load more permissions",
+          hasMore,
+          headerContent: (
+            <SelectionControls
+              selectedPermissions={selectedPermissions}
+              setSelectedPermissions={setSelectedPermissions}
+            />
+          ),
+          countInfoText: (
+            <div className="flex gap-2">
+              <span>Showing</span>{" "}
+              <span className="text-accent-12">
+                {new Intl.NumberFormat().format(permissions.length)}
+              </span>
+              <span>of</span>
+              {new Intl.NumberFormat().format(totalCount)}
+              <span>permissions</span>
+            </div>
+          ),
+        }}
+        emptyState={
+          <div className="w-full flex justify-center items-center h-full">
+            <Empty className="w-[400px] flex items-start">
+              <Empty.Icon className="w-auto" />
+              <Empty.Title>No Permissions Found</Empty.Title>
+              <Empty.Description className="text-left">
+                There are no permissions configured yet. Create your first permission to start
+                managing permissions and access control.
+              </Empty.Description>
+              <Empty.Actions className="mt-4 justify-start">
+                <a
+                  href="https://www.unkey.com/docs/security/permissions"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  <Button size="md">
+                    <BookBookmark />
+                    Learn about Permissions
+                  </Button>
+                </a>
+              </Empty.Actions>
+            </Empty>
           </div>
-        ),
-      }}
-      emptyState={
-        <div className="w-full flex justify-center items-center h-full">
-          <Empty className="w-[400px] flex items-start">
-            <Empty.Icon className="w-auto" />
-            <Empty.Title>No Permissions Found</Empty.Title>
-            <Empty.Description className="text-left">
-              There are no permissions configured yet. Create your first permission to start
-              managing permissions and access control.
-            </Empty.Description>
-            <Empty.Actions className="mt-4 justify-start">
-              <a
-                href="https://www.unkey.com/docs/security/permissions"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <Button size="md">
-                  <BookBookmark />
-                  Learn about Permissions
-                </Button>
-              </a>
-            </Empty.Actions>
-          </Empty>
-        </div>
-      }
-      config={{
-        rowHeight: 52,
-        layoutMode: "grid",
-        rowBorders: true,
-        containerPadding: "px-0",
-      }}
-      renderSkeletonRow={({ columns, rowHeight }) =>
-        columns.map((column) => (
-          <td
-            key={column.key}
-            className={cn(
-              "text-xs align-middle whitespace-nowrap",
-              column.key === "permission" ? "py-[6px]" : "py-1",
-            )}
-            style={{ height: `${rowHeight}px` }}
-          >
-            {column.key === "permission" && <RoleColumnSkeleton />}
-            {column.key === "slug" && <SlugColumnSkeleton />}
-            {column.key === "used_in_roles" && <AssignedKeysColumnSkeleton />}
-            {column.key === "assigned_to_keys" && <AssignedToKeysColumnSkeleton />}
-            {column.key === "last_updated" && <LastUpdatedColumnSkeleton />}
-            {column.key === "action" && <ActionColumnSkeleton />}
-          </td>
-        ))
-      }
-    />
+        }
+        config={{
+          rowHeight: 52,
+          layoutMode: "grid",
+          rowBorders: true,
+          containerPadding: "px-0",
+        }}
+        renderSkeletonRow={({ columns, rowHeight }) =>
+          columns.map((column) => (
+            <td
+              key={column.key}
+              className={cn(
+                "text-xs align-middle whitespace-nowrap",
+                column.key === "permission" ? "py-[6px]" : "py-1",
+              )}
+              style={{ height: `${rowHeight}px` }}
+            >
+              {column.key === "permission" && <RoleColumnSkeleton />}
+              {column.key === "slug" && <SlugColumnSkeleton />}
+              {column.key === "used_in_roles" && <AssignedKeysColumnSkeleton />}
+              {column.key === "assigned_to_keys" && <AssignedToKeysColumnSkeleton />}
+              {column.key === "last_updated" && <LastUpdatedColumnSkeleton />}
+              {column.key === "action" && <ActionColumnSkeleton />}
+            </td>
+          ))
+        }
+      />
+      {selectedPermission && (
+        <EditPermission
+          permission={selectedPermission}
+          isOpen={!!selectedPermission}
+          onClose={() => setSelectedPermission(null)}
+        />
+      )}
+    </>
   );
 };
diff --git a/apps/dashboard/app/(app)/[workspaceSlug]/authorization/roles/components/table/roles-list.tsx b/apps/dashboard/app/(app)/[workspaceSlug]/authorization/roles/components/table/roles-list.tsx
index 8a1bb8bd83..1d7e11ef3a 100644
--- a/apps/dashboard/app/(app)/[workspaceSlug]/authorization/roles/components/table/roles-list.tsx
+++ b/apps/dashboard/app/(app)/[workspaceSlug]/authorization/roles/components/table/roles-list.tsx
@@ -6,6 +6,7 @@ import { BookBookmark, Tag } from "@unkey/icons";
 import { Button, Checkbox, Empty } from "@unkey/ui";
 import { cn } from "@unkey/ui/src/lib/utils";
 import { useCallback, useMemo, useState } from "react";
+import { EditRole } from "./components/actions/components/edit-role";
 import { RolesTableActions } from "./components/actions/keys-table-action.popover.constants";
 import { AssignedItemsCell } from "./components/assigned-items-cell";
 import { LastUpdated } from "./components/last-updated";
@@ -53,18 +54,24 @@ export const RolesList = () => {
           const iconContainer = (
             <div
               className={cn(
-                "size-5 rounded flex items-center justify-center cursor-pointer border border-grayA-3 transition-all duration-100",
+                "size-5 rounded flex items-center justify-center border border-grayA-3 transition-all duration-100",
                 "bg-grayA-3",
                 isSelected && "bg-grayA-5",
               )}
               onMouseEnter={() => setHoveredRoleName(role.name)}
               onMouseLeave={() => setHoveredRoleName(null)}
             >
-              {!isSelected && !isHovered && <Tag iconSize="sm-regular" className="text-gray-12" />}
+              {!isSelected && !isHovered && (
+                <Tag
+                  iconSize="sm-regular"
+                  className="text-gray-12 cursor-pointer w-[12px] h-[12px]"
+                />
+              )}
               {(isSelected || isHovered) && (
                 <Checkbox
                   checked={isSelected}
                   className="size-4 [&_svg]:size-3"
+                  onClick={(e) => e.stopPropagation()}
                   onCheckedChange={() => toggleSelection(role.roleId)}
                 />
               )}
@@ -147,82 +154,91 @@ export const RolesList = () => {
   );
 
   return (
-    <VirtualTable
-      data={roles}
-      isLoading={isLoading}
-      isFetchingNextPage={isLoadingMore}
-      onLoadMore={loadMore}
-      columns={columns}
-      onRowClick={setSelectedRole}
-      selectedItem={selectedRole}
-      keyExtractor={(role) => role.roleId}
-      rowClassName={(role) => getRowClassName(role, selectedRole)}
-      loadMoreFooterProps={{
-        hide: isLoading,
-        buttonText: "Load more roles",
-        hasMore,
-        headerContent: (
-          <SelectionControls selectedRoles={selectedRoles} setSelectedRoles={setSelectedRoles} />
-        ),
-        countInfoText: (
-          <div className="flex gap-2">
-            <span>Showing</span>{" "}
-            <span className="text-accent-12">{new Intl.NumberFormat().format(roles.length)}</span>
-            <span>of</span>
-            {new Intl.NumberFormat().format(totalCount)}
-            <span>roles</span>
+    <>
+      <VirtualTable
+        data={roles}
+        isLoading={isLoading}
+        isFetchingNextPage={isLoadingMore}
+        onLoadMore={loadMore}
+        columns={columns}
+        onRowClick={setSelectedRole}
+        selectedItem={selectedRole}
+        keyExtractor={(role) => role.roleId}
+        rowClassName={(role) => getRowClassName(role, selectedRole)}
+        loadMoreFooterProps={{
+          hide: isLoading,
+          buttonText: "Load more roles",
+          hasMore,
+          headerContent: (
+            <SelectionControls selectedRoles={selectedRoles} setSelectedRoles={setSelectedRoles} />
+          ),
+          countInfoText: (
+            <div className="flex gap-2">
+              <span>Showing</span>{" "}
+              <span className="text-accent-12">{new Intl.NumberFormat().format(roles.length)}</span>
+              <span>of</span>
+              {new Intl.NumberFormat().format(totalCount)}
+              <span>roles</span>
+            </div>
+          ),
+        }}
+        emptyState={
+          <div className="w-full flex justify-center items-center h-full">
+            <Empty className="w-[400px] flex items-start">
+              <Empty.Icon className="w-auto" />
+              <Empty.Title>No Roles Found</Empty.Title>
+              <Empty.Description className="text-left">
+                There are no roles configured yet. Create your first role to start managing
+                permissions and access control.
+              </Empty.Description>
+              <Empty.Actions className="mt-4 justify-start">
+                <a
+                  href="https://www.unkey.com/docs/security/roles"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  <Button size="md">
+                    <BookBookmark />
+                    Learn about Roles
+                  </Button>
+                </a>
+              </Empty.Actions>
+            </Empty>
           </div>
-        ),
-      }}
-      emptyState={
-        <div className="w-full flex justify-center items-center h-full">
-          <Empty className="w-[400px] flex items-start">
-            <Empty.Icon className="w-auto" />
-            <Empty.Title>No Roles Found</Empty.Title>
-            <Empty.Description className="text-left">
-              There are no roles configured yet. Create your first role to start managing
-              permissions and access control.
-            </Empty.Description>
-            <Empty.Actions className="mt-4 justify-start">
-              <a
-                href="https://www.unkey.com/docs/security/roles"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <Button size="md">
-                  <BookBookmark />
-                  Learn about Roles
-                </Button>
-              </a>
-            </Empty.Actions>
-          </Empty>
-        </div>
-      }
-      config={{
-        rowHeight: 52,
-        layoutMode: "grid",
-        rowBorders: true,
-        containerPadding: "px-0",
-      }}
-      renderSkeletonRow={({ columns, rowHeight }) =>
-        columns.map((column) => (
-          <td
-            key={column.key}
-            className={cn(
-              "text-xs align-middle whitespace-nowrap",
-              column.key === "role" ? "py-[6px]" : "py-1",
-            )}
-            style={{ height: `${rowHeight}px` }}
-          >
-            {column.key === "role" && <RoleColumnSkeleton />}
-            {column.key === "slug" && <SlugColumnSkeleton />}
-            {column.key === "assignedKeys" && <AssignedKeysColumnSkeleton />}
-            {column.key === "permissions" && <PermissionsColumnSkeleton />}
-            {column.key === "last_updated" && <LastUpdatedColumnSkeleton />}
-            {column.key === "action" && <ActionColumnSkeleton />}
-          </td>
-        ))
-      }
-    />
+        }
+        config={{
+          rowHeight: 52,
+          layoutMode: "grid",
+          rowBorders: true,
+          containerPadding: "px-0",
+        }}
+        renderSkeletonRow={({ columns, rowHeight }) =>
+          columns.map((column) => (
+            <td
+              key={column.key}
+              className={cn(
+                "text-xs align-middle whitespace-nowrap",
+                column.key === "role" ? "py-[6px]" : "py-1",
+              )}
+              style={{ height: `${rowHeight}px` }}
+            >
+              {column.key === "role" && <RoleColumnSkeleton />}
+              {column.key === "slug" && <SlugColumnSkeleton />}
+              {column.key === "assignedKeys" && <AssignedKeysColumnSkeleton />}
+              {column.key === "permissions" && <PermissionsColumnSkeleton />}
+              {column.key === "last_updated" && <LastUpdatedColumnSkeleton />}
+              {column.key === "action" && <ActionColumnSkeleton />}
+            </td>
+          ))
+        }
+      />
+      {selectedRole && (
+        <EditRole
+          role={selectedRole}
+          isOpen={!!selectedRole}
+          onClose={() => setSelectedRole(null)}
+        />
+      )}
+    </>
   );
 };