diff --git a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index c37b952b9e16..3b0803b98db7 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -423,7 +423,7 @@ public void setSortOrder(FileSortOrder sortOrder) {
     }
 
     private List<File> getFolders(final File directory) {
-        File[] folders = directory.listFiles(File::isFile);
+        File[] folders = directory.listFiles(File::isDirectory);
 
         if (folders != null && folders.length > 0) {
             return new ArrayList<>(Arrays.asList(folders));
diff --git a/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index cfe05620f54b..b60fc8ccf285 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -121,6 +121,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
                 mContainerActivity.getInitialDirectory(), this, getActivity());
         setRecyclerViewAdapter(mAdapter);
 
+        listDirectory(mContainerActivity.getInitialDirectory());
+
         Log_OC.i(TAG, "onActivityCreated() stop");
     }