diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 312acb593922c..c313ae3b94a68 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -634,6 +634,8 @@ public class DirectoryFragment extends Fragment
 
                 case R.id.menu_share:
                     shareDocuments(selection);
+                    // TODO: Only finish selection if share action is completed.
+                    mode.finish();
                     return true;
 
                 case R.id.menu_delete:
@@ -644,6 +646,9 @@ public class DirectoryFragment extends Fragment
 
                 case R.id.menu_copy_to:
                     transferDocuments(selection, FileOperationService.OPERATION_COPY);
+                    // TODO: Only finish selection mode if copy-to is not canceled.
+                    // Need to plum down into handling the way we do with deleteDocuments.
+                    mode.finish();
                     return true;
 
                 case R.id.menu_move_to: