diff --git a/cli/packages/util/secrets.go b/cli/packages/util/secrets.go
index 08e6b563f..dcb431cca 100644
--- a/cli/packages/util/secrets.go
+++ b/cli/packages/util/secrets.go
@@ -885,7 +885,7 @@ func SetEncryptedSecrets(secretArgs []string, secretType string, environmentName
 		}
 
 		// Key and value from argument
-		key := splitKeyValueFromArg[0]
+		key := strings.TrimSpace(splitKeyValueFromArg[0])
 		value := splitKeyValueFromArg[1]
 
 		hashedKey := fmt.Sprintf("%x", sha256.Sum256([]byte(key)))
diff --git a/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx b/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
index 7d7126c56..571de17a3 100644
--- a/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
+++ b/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
@@ -11,7 +11,7 @@ import { SecretType, UserWsKeyPair } from "@app/hooks/api/types";
 import { PopUpNames, usePopUpAction, usePopUpState } from "../../SecretMainPage.store";
 
 const typeSchema = z.object({
-  key: z.string(),
+  key: z.string().trim().min(1, { message: "Secret key is required" }),
   value: z.string().optional()
 });
 
diff --git a/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx b/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx
index 0ef342a2e..c888d6594 100644
--- a/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx
+++ b/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx
@@ -22,7 +22,7 @@ import { DecryptedSecret, SecretType, UserWsKeyPair } from "@app/hooks/api/types
 
 const typeSchema = z
   .object({
-    key: z.string().min(1, "Key is required"),
+    key: z.string().trim().min(1, "Key is required"),
     value: z.string().optional(),
     environments: z.record(z.boolean().optional())
   })