diff --git a/frontend/src/hooks/api/roles/queries.tsx b/frontend/src/hooks/api/roles/queries.tsx
index 288fdf396..063ebd88b 100644
--- a/frontend/src/hooks/api/roles/queries.tsx
+++ b/frontend/src/hooks/api/roles/queries.tsx
@@ -153,7 +153,7 @@ export const useGetUserProjectPermissions = ({ workspaceId }: TGetUserProjectPer
           return (entity) => {
             const rulesStrippedOfWildcard = omit(
               rules,
-              Object.keys(entity).filter((el) => entity[el].includes("*"))
+              Object.keys(entity).filter((el) => entity[el]?.includes("*"))
             );
             const baseMatcher = conditionsMatcher(rulesStrippedOfWildcard);
             return baseMatcher(entity);
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
index d800ddf6b..03a56db36 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
@@ -337,7 +337,7 @@ export const PROJECT_PERMISSION_OBJECT: TProjectPermissionObject = {
     ]
   },
   [ProjectPermissionSub.SecretImports]: {
-    title: "Secret Folders",
+    title: "Secret Imports",
     actions: [
       { label: "Read", value: "read" },
       { label: "Create", value: "create" },
@@ -346,7 +346,7 @@ export const PROJECT_PERMISSION_OBJECT: TProjectPermissionObject = {
     ]
   },
   [ProjectPermissionSub.DynamicSecrets]: {
-    title: "Secret Folders",
+    title: "Dynamic Secrets",
     actions: [
       { label: "Read", value: "read" },
       { label: "Create", value: "create" },
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
index 38f60cc71..a6f94de90 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
@@ -57,6 +57,8 @@ export const SecretPermissionConditions = ({ position = 0, isDisabled }: Props)
                       >
                         <SelectItem value="environment">Environment Slug</SelectItem>
                         <SelectItem value="secretPath">Secret Path</SelectItem>
+                        <SelectItem value="secretName">Secret Name</SelectItem>
+                        <SelectItem value="secretTags">Secret Tags</SelectItem>
                       </Select>
                     </FormControl>
                   )}
diff --git a/frontend/src/views/SecretMainPage/SecretMainPage.tsx b/frontend/src/views/SecretMainPage/SecretMainPage.tsx
index 0ace79777..ea348f083 100644
--- a/frontend/src/views/SecretMainPage/SecretMainPage.tsx
+++ b/frontend/src/views/SecretMainPage/SecretMainPage.tsx
@@ -86,6 +86,7 @@ export const SecretMainPage = () => {
       secretTags: ["*"]
     })
   );
+
   const canReadSecretImports = permission.can(
     ProjectPermissionActions.Read,
     subject(ProjectPermissionSub.SecretImports, { environment, secretPath })
@@ -377,7 +378,7 @@ export const SecretMainPage = () => {
                     <div className="flex-grow px-4 py-2">Value</div>
                   </div>
                 )}
-                {canReadSecretImports && imports?.length && (
+                {canReadSecretImports && Boolean(imports?.length) && (
                   <SecretImportListView
                     searchTerm={debouncedSearchFilter}
                     secretImports={imports}
@@ -388,7 +389,7 @@ export const SecretMainPage = () => {
                     importedSecrets={importedSecrets}
                   />
                 )}
-                {folders?.length && (
+                {Boolean(folders?.length) && (
                   <FolderListView
                     folders={folders}
                     environment={environment}
@@ -397,7 +398,7 @@ export const SecretMainPage = () => {
                     onNavigateToFolder={handleResetFilter}
                   />
                 )}
-                {canReadDynamicSecret && dynamicSecrets?.length && (
+                {canReadDynamicSecret && Boolean(dynamicSecrets?.length) && (
                   <DynamicSecretListView
                     environment={environment}
                     projectSlug={projectSlug}
@@ -405,7 +406,7 @@ export const SecretMainPage = () => {
                     dynamicSecrets={dynamicSecrets}
                   />
                 )}
-                {canReadSecret && secrets?.length && (
+                {canReadSecret && Boolean(secrets?.length) && (
                   <SecretListView
                     secrets={secrets}
                     tags={tags}
diff --git a/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx b/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
index 830d86a4d..d279e2398 100644
--- a/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
@@ -84,12 +84,15 @@ export const SecretDetailSidebar = ({
     resolver: zodResolver(formSchema),
     values: secret
   });
+
   const { permission } = useProjectPermission();
 
   const { fields, append, remove } = useFieldArray({
     control,
     name: "tags"
   });
+
+  const secretKey = secret?.key || "";
   const selectedTags = watch("tags", []) || [];
   const selectedTagsGroupById = selectedTags.reduce<Record<string, boolean>>(
     (prev, curr) => ({ ...prev, [curr.id]: true }),
@@ -102,7 +105,7 @@ export const SecretDetailSidebar = ({
     subject(ProjectPermissionSub.Secrets, {
       environment,
       secretPath,
-      secretName: secret.key,
+      secretName: secretKey,
       secretTags: selectTagSlugs
     })
   );
@@ -112,7 +115,7 @@ export const SecretDetailSidebar = ({
       subject(ProjectPermissionSub.Secrets, {
         environment,
         secretPath,
-        secretName: secret.key,
+        secretName: secretKey,
         secretTags: selectTagSlugs
       })
     ) && cannotEditSecret;
@@ -209,7 +212,7 @@ export const SecretDetailSidebar = ({
                 a={subject(ProjectPermissionSub.Secrets, {
                   environment,
                   secretPath,
-                  secretName: secret.key,
+                  secretName: secretKey,
                   secretTags: selectTagSlugs
                 })}
               >
@@ -241,7 +244,7 @@ export const SecretDetailSidebar = ({
                   a={subject(ProjectPermissionSub.Secrets, {
                     environment,
                     secretPath,
-                    secretName: secret.key,
+                    secretName: secretKey,
                     secretTags: selectTagSlugs
                   })}
                 >
@@ -302,7 +305,7 @@ export const SecretDetailSidebar = ({
                       a={subject(ProjectPermissionSub.Secrets, {
                         environment,
                         secretPath,
-                        secretName: secret.key,
+                        secretName: secretKey,
                         secretTags: selectTagSlugs
                       })}
                     >
@@ -394,6 +397,7 @@ export const SecretDetailSidebar = ({
                       variant="outline_bg"
                       leftIcon={<FontAwesomeIcon icon={faClock} />}
                       onClick={() => setCreateReminderFormOpen.on()}
+                      isDisabled={cannotEditSecret}
                     >
                       Create Reminder
                     </Button>
@@ -418,7 +422,7 @@ export const SecretDetailSidebar = ({
                       a={subject(ProjectPermissionSub.Secrets, {
                         environment,
                         secretPath,
-                        secretName: secret.key,
+                        secretName: secretKey,
                         secretTags: selectTagSlugs
                       })}
                     >
@@ -485,7 +489,7 @@ export const SecretDetailSidebar = ({
                     a={subject(ProjectPermissionSub.Secrets, {
                       environment,
                       secretPath,
-                      secretName: secret.key,
+                      secretName: secretKey,
                       secretTags: selectTagSlugs
                     })}
                   >
@@ -505,7 +509,7 @@ export const SecretDetailSidebar = ({
                     a={subject(ProjectPermissionSub.Secrets, {
                       environment,
                       secretPath,
-                      secretName: secret.key,
+                      secretName: secretKey,
                       secretTags: selectTagSlugs
                     })}
                   >