diff --git a/frontend/src/components/v2/SecretInput/SecretInput.tsx b/frontend/src/components/v2/SecretInput/SecretInput.tsx
index 96f79e65f..c8b8f2ee6 100644
--- a/frontend/src/components/v2/SecretInput/SecretInput.tsx
+++ b/frontend/src/components/v2/SecretInput/SecretInput.tsx
@@ -93,6 +93,7 @@ export const SecretInput = forwardRef<HTMLTextAreaElement, Props>(
             onFocus={(evt) => {
               onFocus?.(evt);
               setIsSecretFocused.on();
+              evt.currentTarget.select();
             }}
             disabled={isDisabled}
             spellCheck={false}
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx
index 0f4c2be56..fcac51ed8 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx
@@ -179,7 +179,7 @@ export const SecretEditRow = ({
       />
       {secretValueHidden && (
         <Tooltip
-          content={`You do not have permission to read the value of this secret.${canEditSecretValue ? " But you can edit this secret" : ""}`}
+          content={`You do not have access to view the current value${canEditSecretValue ? ", but you can set a new one" : "."}`}
         >
           <FontAwesomeIcon className="pl-1" icon={faEyeSlash} />
         </Tooltip>
@@ -190,7 +190,7 @@ export const SecretEditRow = ({
           <div className="flex flex-grow items-center gap-2" onClick={handleSecretBlurClick}>
             <span className="flex flex-row items-center">
               <div style={{ fontFamily: "monospace" }} className="h-full w-full">
-                *********************
+                ******
               </div>
             </span>
           </div>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
index 78afaa021..0b2f7d07b 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
@@ -87,7 +87,7 @@ export const SecretOverviewTableRow = ({
     );
 
     if (secret?.secretValueHidden) {
-      return canEditSecretValue ? "<hidden-by-infisical>" : "";
+      return canEditSecretValue ? "******" : "";
     }
     return secret?.valueOverride || secret?.value || importedSecret?.secret?.value || "";
   };
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
index e5251644f..d86342e79 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
@@ -56,6 +56,8 @@ import {
   TFormSchema
 } from "./SecretListView.utils";
 
+const hiddenValue = "******";
+
 type Props = {
   secret: SecretV3RawSanitized;
   onSaveSecret: (
@@ -107,7 +109,7 @@ export const SecretItem = memo(
 
     const getDefaultValue = () => {
       if (secret.secretValueHidden) {
-        return canEditSecretValue ? "<hidden-by-infisical>" : "";
+        return canEditSecretValue ? hiddenValue : "";
       }
       return secret.valueOverride || secret.value || "";
     };
@@ -312,7 +314,7 @@ export const SecretItem = memo(
             >
               {secretValueHidden && (
                 <Tooltip
-                  content={`You do not have permission to read the value of this secret.${canEditSecretValue ? " But you can edit this secret" : ""}`}
+                  content={`You do not have access to view the current value${canEditSecretValue ? ", but you can set a new one" : "."}`}
                 >
                   <FontAwesomeIcon className="pr-2" icon={faEyeSlash} />
                 </Tooltip>
@@ -337,7 +339,7 @@ export const SecretItem = memo(
                 <div className="flex flex-grow items-center gap-2" onClick={handleSecretBlurClick}>
                   <span className="flex flex-row items-center">
                     <div style={{ fontFamily: "monospace" }} className="h-full w-full">
-                      *********************
+                      {hiddenValue}
                     </div>
                   </span>
                 </div>
@@ -354,7 +356,7 @@ export const SecretItem = memo(
                       environment={environment}
                       secretPath={secretPath}
                       {...field}
-                      defaultValue={secretValueHidden ? "<hidden-by-infisical>" : undefined}
+                      defaultValue={secretValueHidden ? hiddenValue : undefined}
                       containerClassName="py-1.5 rounded-md transition-all"
                     />
                   )}