diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue
index 67cc535be..d5b79a447 100644
--- a/webapp/components/MasonryGrid/MasonryGrid.vue
+++ b/webapp/components/MasonryGrid/MasonryGrid.vue
@@ -49,8 +49,11 @@ export default {
     window.removeEventListener('resize', this._onResize)
   },
   updated() {
-    const count = this.$children.length
-    if (count !== this.childCount) {
+    const childEls = this.$children.map((c) => c.$el)
+    const changed =
+      childEls.length !== (this._trackedEls || []).length ||
+      childEls.some((el, i) => el !== this._trackedEls[i])
+    if (changed) {
       this.batchRecalculate()
     }
   },
@@ -60,6 +63,7 @@ export default {
       const id = this._recalcId
 
       this.childCount = this.$children.length
+      this._trackedEls = this.$children.map((c) => c.$el)
       // Switch to auto-height so items take their natural height
       this.measuring = true
 
diff --git a/webapp/components/_new/features/SearchResults/SearchResults.vue b/webapp/components/_new/features/SearchResults/SearchResults.vue
index 2c73bac74..39094895c 100644
--- a/webapp/components/_new/features/SearchResults/SearchResults.vue
+++ b/webapp/components/_new/features/SearchResults/SearchResults.vue
@@ -165,6 +165,7 @@ export default {
       hashtagPage: 0,
 
       activeTab: null,
+      tabManuallySet: false,
 
       firstPosts: this.pageSize,
       firstUsers: this.pageSize,
@@ -177,6 +178,25 @@ export default {
       hashtagsOffset: 0,
     }
   },
+  watch: {
+    search() {
+      this.activeTab = null
+      this.tabManuallySet = false
+      this.clearPage()
+      this.postsOffset = 0
+      this.usersOffset = 0
+      this.groupsOffset = 0
+      this.hashtagsOffset = 0
+      this.postCount = 0
+      this.userCount = 0
+      this.groupCount = 0
+      this.hashtagCount = 0
+      this.posts = []
+      this.users = []
+      this.groups = []
+      this.hashtags = []
+    },
+  },
   computed: {
     activeResources() {
       if (this.activeTab === 'Post') return this.posts
@@ -256,6 +276,7 @@ export default {
     switchTab(tabType) {
       if (this.activeTab !== tabType) {
         this.activeTab = tabType
+        this.tabManuallySet = true
       }
     },
     previousResults() {
@@ -323,6 +344,7 @@ export default {
         this.hashtags = searchHashtags.hashtags
         this.hashtagCount = searchHashtags.hashtagCount
         if (
+          this.activeTab === null &&
           this.postCount === 0 &&
           this.userCount === 0 &&
           this.groupCount === 0 &&
@@ -350,7 +372,8 @@ export default {
       update({ searchUsers }) {
         this.users = searchUsers.users
         this.userCount = searchUsers.userCount
-        if (this.postCount === 0 && this.userCount > 0) this.activeTab = 'User'
+        if (this.activeTab === null && this.postCount === 0 && this.userCount > 0)
+          this.activeTab = 'User'
       },
       fetchPolicy: 'cache-and-network',
     },
@@ -372,7 +395,7 @@ export default {
       update({ searchPosts }) {
         this.posts = searchPosts.posts
         this.postCount = searchPosts.postCount
-        if (this.postCount > 0) this.activeTab = 'Post'
+        if (this.postCount > 0 && !this.tabManuallySet) this.activeTab = 'Post'
       },
       fetchPolicy: 'cache-and-network',
     },
@@ -394,7 +417,12 @@ export default {
       update({ searchGroups }) {
         this.groups = searchGroups.groups
         this.groupCount = searchGroups.groupCount
-        if (this.postCount === 0 && this.userCount === 0 && this.groupCount > 0)
+        if (
+          this.activeTab === null &&
+          this.postCount === 0 &&
+          this.userCount === 0 &&
+          this.groupCount > 0
+        )
           this.activeTab = 'Group'
       },
       fetchPolicy: 'cache-and-network',