diff --git a/Example/WPMediaPicker/DemoViewController.m b/Example/WPMediaPicker/DemoViewController.m
index 627a0a63..7720b947 100644
--- a/Example/WPMediaPicker/DemoViewController.m
+++ b/Example/WPMediaPicker/DemoViewController.m
@@ -31,8 +31,8 @@ - (void)viewDidLoad
     self.dateFormatter.timeStyle = NSDateFormatterMediumStyle;
     [self.tableView registerClass:[WPMediaGroupTableViewCell class] forCellReuseIdentifier:NSStringFromClass([WPMediaGroupTableViewCell class])];
     self.options = @{
-                     MediaPickerOptionsShowMostRecentFirst:@(NO),
-                     MediaPickerOptionsUsePhotosLibrary:@(NO),
+                     MediaPickerOptionsShowMostRecentFirst:@(YES),
+                     MediaPickerOptionsUsePhotosLibrary:@(YES),
                      MediaPickerOptionsShowCameraCapture:@(YES),
                      MediaPickerOptionsAllowMultipleSelection:@(YES)
                      };
diff --git a/Pod/Classes/WPMediaCollectionViewController.m b/Pod/Classes/WPMediaCollectionViewController.m
index 90100ce0..82611398 100644
--- a/Pod/Classes/WPMediaCollectionViewController.m
+++ b/Pod/Classes/WPMediaCollectionViewController.m
@@ -559,9 +559,20 @@ - (BOOL)isMediaDeviceAvailable
 - (void)showMediaCaptureViewController
 {
     UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
-    imagePickerController.mediaTypes =
-        [UIImagePickerController availableMediaTypesForSourceType:
-                                     UIImagePickerControllerSourceTypeCamera];
+    NSMutableSet *mediaTypes = [NSMutableSet setWithArray:[UIImagePickerController availableMediaTypesForSourceType:
+                           UIImagePickerControllerSourceTypeCamera]];
+    switch (self.filter) {
+        case(WPMediaTypeImage): {
+            [mediaTypes intersectSet:[NSSet setWithArray:@[(__bridge NSString *)kUTTypeImage]]];
+        } break;
+        case(WPMediaTypeVideo): {
+            [mediaTypes intersectSet:[NSSet setWithArray:@[(__bridge NSString *)kUTTypeMovie]]];
+        } break;
+        default: {
+            //Don't intersect at all
+        }
+    }
+    imagePickerController.mediaTypes = [mediaTypes allObjects];
     imagePickerController.delegate = self;
     imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
     imagePickerController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;