src/components/search/search.js

@@ -124,11 +124,9 @@ const Search = {
 
       let searchTypes = allSearchTypes
       if (searchType) {
-        // Search only for `searchType` if it is provided
         searchTypes = [searchType]
-      } else if (this.hasUserSelectedTab && this.currentResultTab !== 'statuses') {
+      } else if (this.currentResultTab !== 'statuses') {
-        // Start the search from the tab that the user has selected
+        // Sort search order; selected tab first
-        // No need to sort if userPreferredTab === 'statuses'
         searchTypes = [
           this.currentResultTab,
           ...allSearchTypes.filter((tab) => tab !== this.currentResultTab)

src/components/search/search.vue

@@ -75,7 +75,7 @@
         <button
           v-if="!loading['statuses'] && loadedInitially && lastStatusFetchCount > 0"
           class="more-statuses-button button-unstyled -link -fullwidth"
-          @click.prevent="search(lastQuery, 'statuses')"
+          @click.prevent="search(searchTerm, 'statuses')"
         >
           <div class="new-status-notification text-center">
             {{ $t('search.load_more') }}
@@ -114,7 +114,7 @@
         <button
           v-if="!loading['media'] && loadedInitially && lastMediaFetchCount > 0"
           class="more-statuses-button button-unstyled -link -fullwidth"
-          @click.prevent="search(lastQuery, 'media')"
+          @click.prevent="search(searchTerm, 'media')"
         >
           <div class="new-status-notification text-center">
             {{ $t('search.load_more') }}