diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
index e378ef53b..f32fb286b 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
@@ -198,6 +198,22 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
         } else {
             adapter.setItems(categories);
         }
+        adapter.notifyDataSetChanged();
+
+        // Nested waiting for search result data to load into the category
+        // list and smoothly scroll to the top of the search result list.
+        rvCategories.post(new Runnable() {
+            @Override
+            public void run() {
+                rvCategories.smoothScrollToPosition(0);
+                rvCategories.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        rvCategories.smoothScrollToPosition(0);
+                    }
+                });
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
index 3582f69c0..4450f67ef 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
@@ -246,7 +246,21 @@ public class DepictsFragment extends UploadBaseFragment implements DepictsContra
                 adapter.setItems(depictedItemList);
             }
         }
-        depictsRecyclerView.smoothScrollToPosition(0);
+
+        // Nested waiting for search result data to load into the depicted item
+        // list and smoothly scroll to the top of the search result list.
+        depictsRecyclerView.post(new Runnable() {
+            @Override
+            public void run() {
+                depictsRecyclerView.smoothScrollToPosition(0);
+                depictsRecyclerView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        depictsRecyclerView.smoothScrollToPosition(0);
+                    }
+                });
+            }
+        });
     }
 
     /**