diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 18038398955f..2f2766ac6f83 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -1852,17 +1852,14 @@ protected void handleSearchEvent(SearchEvent event) {
         searchFragment = true;
         setFabVisible(false);
 
-        Runnable switchViewsRunnable = () -> {
+        new Handler(Looper.getMainLooper()).post(() -> {
+            updateSortButton();
             if (isGridViewPreferred(mFile) && !isGridEnabled()) {
                 switchToGridView();
             } else if (!isGridViewPreferred(mFile) && isGridEnabled()) {
                 switchToListView();
             }
-        };
-
-        updateSortButton();
-
-        new Handler(Looper.getMainLooper()).post(switchViewsRunnable);
+        });
 
         final User currentUser = accountManager.getUser();
         final var remoteOperation = getSearchRemoteOperation(currentUser, event);
@@ -1870,7 +1867,6 @@ protected void handleSearchEvent(SearchEvent event) {
         searchTask.execute();
     }
 
-
     protected RemoteOperation getSearchRemoteOperation(final User currentUser, final SearchEvent event) {
         boolean searchOnlyFolders = (getArguments() != null && getArguments().getBoolean(ARG_SEARCH_ONLY_FOLDER, false));