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 bf37810c0..0452a28bd 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
@@ -142,7 +142,7 @@ export const SecretItem = memo(
     );
 
     const getDefaultValue = () => {
-      if (secret.secretValueHidden) {
+      if (secret.secretValueHidden && !isPending) {
         return canEditSecretValue ? HIDDEN_SECRET_VALUE : "";
       }
       return secret.valueOverride || secret.value || "";
@@ -413,7 +413,7 @@ export const SecretItem = memo(
               tabIndex={0}
               role="button"
             >
-              {secretValueHidden && !isOverriden && (
+              {secretValueHidden && !isOverriden && !isPending && (
                 <Tooltip
                   content={`You do not have access to view the current value${canEditSecretValue && !isRotatedSecret ? ", but you can set a new one" : "."}`}
                 >
@@ -444,12 +444,14 @@ export const SecretItem = memo(
                     <InfisicalSecretInput
                       isReadOnly={isReadOnlySecret}
                       key="secret-value"
-                      isVisible={isVisible && !secretValueHidden}
-                      canEditButNotView={secretValueHidden && !isOverriden}
+                      isVisible={isVisible && (!secretValueHidden || isPending)}
+                      canEditButNotView={secretValueHidden && !isOverriden && !isPending}
                       environment={environment}
                       secretPath={secretPath}
                       {...field}
-                      defaultValue={secretValueHidden ? HIDDEN_SECRET_VALUE : undefined}
+                      defaultValue={
+                        secretValueHidden && !isPending ? HIDDEN_SECRET_VALUE : undefined
+                      }
                       containerClassName="py-1.5 rounded-md transition-all"
                     />
                   )}