diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 2db8fad714a98..5e7a229fda9d4 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -170,6 +170,7 @@ public class DirectoryFragment extends Fragment
     private RootInfo mRoot;
     private DocumentInfo mDocument;
     private String mQuery = null;
+    // Save selection found during creation so it can be restored during directory loading.
     private Selection mSelection = null;
     private boolean mSearchMode = false;
     private @Nullable ActionMode mActionMode;
@@ -698,7 +699,7 @@ public class DirectoryFragment extends Fragment
 
     public final boolean onBackPressed() {
         if (mSelectionManager.hasSelection()) {
-            if (DEBUG) Log.d(TAG, "Clearing selection on back pressed.");
+            if (DEBUG) Log.d(TAG, "Clearing selection on selection manager.");
             mSelectionManager.clearSelection();
             return true;
         }
@@ -1817,6 +1818,7 @@ public class DirectoryFragment extends Fragment
 
         if (mSelection != null) {
             mSelectionManager.setItemsSelected(mSelection.toList(), true);
+            mSelection.clear();
         }
 
         // Restore any previous instance state