diff --git a/packages/hoppscotch-app/components/collections/ChooseType.vue b/packages/hoppscotch-app/components/collections/ChooseType.vue
index ab8fcc489..fffc68ae3 100644
--- a/packages/hoppscotch-app/components/collections/ChooseType.vue
+++ b/packages/hoppscotch-app/components/collections/ChooseType.vue
@@ -115,10 +115,7 @@ const updateSelectedTeam = (team: TeamData | undefined) => {
   emit("update-selected-team", team)
 }
 
-watch(
-  () => selectedCollectionTab.value,
-  (newValue: string) => {
-    updateCollectionsType(newValue)
-  }
-)
+watch(selectedCollectionTab, (newValue: string) => {
+  updateCollectionsType(newValue)
+})
 </script>
diff --git a/packages/hoppscotch-app/components/collections/index.vue b/packages/hoppscotch-app/components/collections/index.vue
index 5afb4a175..9b2df6d28 100644
--- a/packages/hoppscotch-app/components/collections/index.vue
+++ b/packages/hoppscotch-app/components/collections/index.vue
@@ -337,6 +337,9 @@ export default defineComponent({
     "collectionsType.selectedTeam"(value) {
       if (value?.id) this.teamCollectionAdapter.changeTeamID(value.id)
     },
+    currentUser(newValue) {
+      if (!newValue) this.updateCollectionType("my-collections")
+    },
   },
   mounted() {
     this.subscribeTo(this.teamCollectionAdapter.collections$, (colls) => {
diff --git a/packages/hoppscotch-app/components/smart/Tabs.vue b/packages/hoppscotch-app/components/smart/Tabs.vue
index 74044f41d..f6a8a5fdd 100644
--- a/packages/hoppscotch-app/components/smart/Tabs.vue
+++ b/packages/hoppscotch-app/components/smart/Tabs.vue
@@ -129,6 +129,10 @@ const removeTabEntry = (tabID: string) => {
   }
 
   tabEntries.value.splice(index, 1)
+
+  // If we tried to remove the active tabEntries, switch to first tab entry
+  if (props.value === tabID)
+    if (tabEntries.value.length > 0) selectTab(tabEntries.value[0][0])
 }
 
 provide<TabProvider>("tabs-system", {