src/components/search/search.js

@@ -153,6 +153,13 @@ const Search = {
             'followingOnly' in this.filter && this.filter.followingOnly
         })
 
+        for (const value of Object.values(data)) {
+          if (value.length) {
+            this.loading = true
+            break
+          }
+        }
+
         // Always append to old results. If new results are empty, this doesn't change anything
         this.userIds = this.userIds.concat(map(data.accounts, 'id'))
         this.statuses = uniqBy(this.statuses.concat(data.statuses), 'id')
@@ -175,20 +182,11 @@ const Search = {
           this.statusesOffset = this.statuses.length
           // Because the amount of new statuses can actually be zero, compare to old length instead
           this.lastStatusFetchCount = this.statuses.length - oldStatusesLength
-        } else if (searchType === 'media') {
+        }
+        if (searchType === 'media') {
           this.mediaOffset = this.media.length
           this.lastMediaFetchCount = this.media.length - oldMediaLength
         }
-
-        if (searchTypes.length > 1) {
-          for (const value of Object.values(data)) {
-            if (value.length) {
-              // Show results on the first meaningful response
-              this.loading = false
-              break
-            }
-          }
-        }
       }
 
       this.lastQuery = query