diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 7f3d67497296..20a0e5c956b9 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -1190,6 +1190,8 @@ public void run() {
                     onlyOnDevice,
                     mLimitToMimeType
                 );
+
+                OCFile previousDirectory = mFile;
                 mFile = directory;
 
                 updateLayout();
@@ -1197,7 +1199,9 @@ public void run() {
                 mAdapter.setHighlightedItem(file);
                 int position = mAdapter.getItemPosition(file);
                 if (position == -1) {
-                    getRecyclerView().scrollToPosition(0);
+                    if (previousDirectory == null || !previousDirectory.equals(directory)) {
+                        getRecyclerView().scrollToPosition(0);
+                    }
                 } else {
                     getRecyclerView().scrollToPosition(position);
                 }