diff --git a/packages/hoppscotch-common/src/components/collections/Add.vue b/packages/hoppscotch-common/src/components/collections/Add.vue
index ff5e7aac..2a39b7d4 100644
--- a/packages/hoppscotch-common/src/components/collections/Add.vue
+++ b/packages/hoppscotch-common/src/components/collections/Add.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         :label="t('action.label')"
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/collections/AddFolder.vue b/packages/hoppscotch-common/src/components/collections/AddFolder.vue
index 02012ba5..e8f3aaf1 100644
--- a/packages/hoppscotch-common/src/components/collections/AddFolder.vue
+++ b/packages/hoppscotch-common/src/components/collections/AddFolder.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         input-styles="floating-input"
         :label="t('action.label')"
diff --git a/packages/hoppscotch-common/src/components/collections/AddRequest.vue b/packages/hoppscotch-common/src/components/collections/AddRequest.vue
index 823b977d..3d60e17a 100644
--- a/packages/hoppscotch-common/src/components/collections/AddRequest.vue
+++ b/packages/hoppscotch-common/src/components/collections/AddRequest.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         :label="t('action.label')"
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/collections/Edit.vue b/packages/hoppscotch-common/src/components/collections/Edit.vue
index a191a7ee..2199b639 100644
--- a/packages/hoppscotch-common/src/components/collections/Edit.vue
+++ b/packages/hoppscotch-common/src/components/collections/Edit.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         input-styles="floating-input"
         :label="t('action.label')"
diff --git a/packages/hoppscotch-common/src/components/collections/EditFolder.vue b/packages/hoppscotch-common/src/components/collections/EditFolder.vue
index 7eaede46..4df949e9 100644
--- a/packages/hoppscotch-common/src/components/collections/EditFolder.vue
+++ b/packages/hoppscotch-common/src/components/collections/EditFolder.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         :label="t('action.label')"
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/collections/EditRequest.vue b/packages/hoppscotch-common/src/components/collections/EditRequest.vue
index 394a5e62..7d614038 100644
--- a/packages/hoppscotch-common/src/components/collections/EditRequest.vue
+++ b/packages/hoppscotch-common/src/components/collections/EditRequest.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         :label="t('action.label')"
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/collections/graphql/AddRequest.vue b/packages/hoppscotch-common/src/components/collections/graphql/AddRequest.vue
index f103f80c..aeeacb9a 100644
--- a/packages/hoppscotch-common/src/components/collections/graphql/AddRequest.vue
+++ b/packages/hoppscotch-common/src/components/collections/graphql/AddRequest.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         :label="t('action.label')"
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/collections/graphql/Edit.vue b/packages/hoppscotch-common/src/components/collections/graphql/Edit.vue
index b28f4ba4..c6bc7c5a 100644
--- a/packages/hoppscotch-common/src/components/collections/graphql/Edit.vue
+++ b/packages/hoppscotch-common/src/components/collections/graphql/Edit.vue
@@ -7,7 +7,7 @@
   >
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         placeholder=" "
         :label="t('action.label')"
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/environments/my/Details.vue b/packages/hoppscotch-common/src/components/environments/my/Details.vue
index 79060381..7a2a7262 100644
--- a/packages/hoppscotch-common/src/components/environments/my/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/my/Details.vue
@@ -8,7 +8,7 @@
     <template #body>
       <div class="flex flex-col">
         <HoppSmartInput
-          v-model="name"
+          v-model="editingName"
           placeholder=" "
           :label="t('action.label')"
           input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/environments/teams/Details.vue b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
index 952801f7..8170a42e 100644
--- a/packages/hoppscotch-common/src/components/environments/teams/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
@@ -8,7 +8,7 @@
     <template #body>
       <div class="flex flex-col px-2">
         <HoppSmartInput
-          v-model="name"
+          v-model="editingName"
           placeholder=" "
           :input-styles="['floating-input', isViewer && 'opacity-25']"
           :label="t('action.label')"
diff --git a/packages/hoppscotch-common/src/components/realtime/Subscription.vue b/packages/hoppscotch-common/src/components/realtime/Subscription.vue
index d39797bf..2fcea478 100644
--- a/packages/hoppscotch-common/src/components/realtime/Subscription.vue
+++ b/packages/hoppscotch-common/src/components/realtime/Subscription.vue
@@ -35,7 +35,7 @@
       <div class="relative flex flex-col">
         <input
           id="selectLabelAdd"
-          v-model="name"
+          v-model="editingName"
           v-focus
           class="input floating-input"
           placeholder=" "
diff --git a/packages/hoppscotch-common/src/components/teams/Add.vue b/packages/hoppscotch-common/src/components/teams/Add.vue
index 3aa95d95..8ff96528 100644
--- a/packages/hoppscotch-common/src/components/teams/Add.vue
+++ b/packages/hoppscotch-common/src/components/teams/Add.vue
@@ -2,7 +2,7 @@
   <HoppSmartModal v-if="show" dialog :title="t('team.new')" @close="hideModal">
     <template #body>
       <HoppSmartInput
-        v-model="name"
+        v-model="editingName"
         :label="t('action.label')"
         placeholder=" "
         input-styles="floating-input"
diff --git a/packages/hoppscotch-common/src/components/teams/Edit.vue b/packages/hoppscotch-common/src/components/teams/Edit.vue
index f3f77a6b..90fc8865 100644
--- a/packages/hoppscotch-common/src/components/teams/Edit.vue
+++ b/packages/hoppscotch-common/src/components/teams/Edit.vue
@@ -3,7 +3,7 @@
     <template #body>
       <div class="flex flex-col">
         <HoppSmartInput
-          v-model="name"
+          v-model="editingName"
           placeholder=" "
           :label="t('action.label')"
           input-styles="floating-input"
@@ -177,7 +177,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, toRef, watch } from "vue"
+import { computed, ref, watch } from "vue"
 import * as E from "fp-ts/Either"
 import {
   GetTeamDocument,
@@ -228,7 +228,7 @@ const props = defineProps<{
 
 const toast = useToast()
 
-const editingName = toRef(props.editingTeam, "name")
+const editingName = ref(props.editingTeam.name)
 
 watch(
   () => props.editingTeam.name,