diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
index 566831f..c34bbd2 100644
--- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
+++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
@@ -217,6 +217,7 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
     public void onClickCancel(@NonNull View view) {
         if (mListener != null) {
             mListener.onCancelled();
+            dismiss();
         }
     }
 
@@ -274,6 +275,7 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
                 mListener.onFilePicked(toUri(getFirstCheckedItem()));
             }
         }
+        dismiss();
     }
 
     /**