diff --git a/packages/hoppscotch-common/src/components/environments/my/index.vue b/packages/hoppscotch-common/src/components/environments/my/index.vue
index 86ee2d215..23fdef667 100644
--- a/packages/hoppscotch-common/src/components/environments/my/index.vue
+++ b/packages/hoppscotch-common/src/components/environments/my/index.vue
@@ -135,12 +135,11 @@ defineActionHandler(
   "modals.my.environment.edit",
   ({ envName, variableName, isSecret }) => {
     if (variableName) editingVariableName.value = variableName
-    const envIndex: number =
-      alphabeticallySortedPersonalEnvironments.value.findIndex(({ env }) => {
-        return env.name === envName
-      })
-    if (envName !== "Global") {
-      editEnvironment(envIndex)
+    const env = alphabeticallySortedPersonalEnvironments.value.find(
+      ({ env }) => env.name === envName
+    )
+    if (envName !== "Global" && env) {
+      editEnvironment(env.index)
       secretOptionSelected.value = isSecret ?? false
     }
   }