diff --git a/modules/lightning_features/lightning_media/lightning_media.install b/modules/lightning_features/lightning_media/lightning_media.install
index 0672a72..1157035 100644
--- a/modules/lightning_features/lightning_media/lightning_media.install
+++ b/modules/lightning_features/lightning_media/lightning_media.install
@@ -142,18 +142,18 @@ function lightning_media_update_8008() {
 
   $display_id = $view->addDisplay('entity_browser', 'Browser');
   $display = &$view->getDisplay($display_id);
-  $display = array_merge($display, array(
+  $display = array_merge($display, [
     'display_options' =>
-      array(
+      [
         'display_extenders' =>
-          array(),
+          [],
         'style' =>
-          array(
+          [
             'type' => 'grid',
             'options' =>
-              array(
+              [
                 'grouping' =>
-                  array(),
+                  [],
                 'columns' => '4',
                 'automatic_width' => 1,
                 'alignment' => 'horizontal',
@@ -161,10 +161,10 @@ function lightning_media_update_8008() {
                 'col_class_custom' => '',
                 'row_class_default' => 1,
                 'row_class_custom' => '',
-              ),
-          ),
+              ],
+          ],
         'defaults' =>
-          array(
+          [
             'style' => FALSE,
             'row' => FALSE,
             'fields' => FALSE,
@@ -173,17 +173,18 @@ function lightning_media_update_8008() {
             'empty' => FALSE,
             'pager' => FALSE,
             'css_class' => FALSE,
-          ),
+            'arguments' => FALSE,
+          ],
         'row' =>
-          array(
+          [
             'type' => 'fields',
             'options' =>
-              array(),
-          ),
+              [],
+          ],
         'fields' =>
-          array(
+          [
             'thumbnail__target_id' =>
-              array(
+              [
                 'id' => 'thumbnail__target_id',
                 'table' => 'media_field_data',
                 'field' => 'thumbnail__target_id',
@@ -193,7 +194,7 @@ function lightning_media_update_8008() {
                 'label' => '',
                 'exclude' => FALSE,
                 'alter' =>
-                  array(
+                  [
                     'alter_text' => FALSE,
                     'text' => '',
                     'make_link' => FALSE,
@@ -220,7 +221,7 @@ function lightning_media_update_8008() {
                     'trim' => FALSE,
                     'preserve_tags' => '',
                     'html' => FALSE,
-                  ),
+                  ],
                 'element_type' => '',
                 'element_class' => '',
                 'element_label_type' => '',
@@ -236,13 +237,13 @@ function lightning_media_update_8008() {
                 'click_sort_column' => 'target_id',
                 'type' => 'image',
                 'settings' =>
-                  array(
+                  [
                     'image_style' => 'medium',
                     'image_link' => '',
-                  ),
+                  ],
                 'group_column' => '',
                 'group_columns' =>
-                  array(),
+                  [],
                 'group_rows' => TRUE,
                 'delta_limit' => 0,
                 'delta_offset' => 0,
@@ -254,9 +255,9 @@ function lightning_media_update_8008() {
                 'entity_type' => 'media',
                 'entity_field' => 'thumbnail',
                 'plugin_id' => 'field',
-              ),
+              ],
             'entity_browser_select' =>
-              array(
+              [
                 'id' => 'entity_browser_select',
                 'table' => 'media',
                 'field' => 'entity_browser_select',
@@ -266,7 +267,7 @@ function lightning_media_update_8008() {
                 'label' => '',
                 'exclude' => 0,
                 'alter' =>
-                  array(
+                  [
                     'alter_text' => 0,
                     'text' => '',
                     'make_link' => 0,
@@ -293,7 +294,7 @@ function lightning_media_update_8008() {
                     'trim' => 0,
                     'preserve_tags' => '',
                     'html' => 0,
-                  ),
+                  ],
                 'element_type' => '',
                 'element_class' => '',
                 'element_label_type' => '',
@@ -309,12 +310,12 @@ function lightning_media_update_8008() {
                 'selection_type' => 'radio',
                 'entity_type' => 'media',
                 'plugin_id' => 'entity_browser_select',
-              ),
-          ),
+              ],
+          ],
         'filters' =>
-          array(
+          [
             'status' =>
-              array(
+              [
                 'id' => 'status',
                 'table' => 'media_field_data',
                 'field' => 'status',
@@ -326,7 +327,7 @@ function lightning_media_update_8008() {
                 'group' => 1,
                 'exposed' => FALSE,
                 'expose' =>
-                  array(
+                  [
                     'operator_id' => '',
                     'label' => 'True',
                     'description' => NULL,
@@ -337,13 +338,13 @@ function lightning_media_update_8008() {
                     'remember' => FALSE,
                     'multiple' => FALSE,
                     'remember_roles' =>
-                      array(
+                      [
                         'authenticated' => 'authenticated',
-                      ),
-                  ),
+                      ],
+                  ],
                 'is_grouped' => TRUE,
                 'group_info' =>
-                  array(
+                  [
                     'label' => 'Publishing status',
                     'description' => '',
                     'identifier' => 'status',
@@ -353,29 +354,29 @@ function lightning_media_update_8008() {
                     'remember' => FALSE,
                     'default_group' => 'All',
                     'default_group_multiple' =>
-                      array(),
+                      [],
                     'group_items' =>
-                      array(
+                      [
                         1 =>
-                          array(
+                          [
                             'title' => 'Published',
                             'operator' => '=',
                             'value' => '1',
-                          ),
+                          ],
                         2 =>
-                          array(
+                          [
                             'title' => 'Unpublished',
                             'operator' => '=',
                             'value' => '0',
-                          ),
-                      ),
-                  ),
+                          ],
+                      ],
+                  ],
                 'plugin_id' => 'boolean',
                 'entity_type' => 'media',
                 'entity_field' => 'status',
-              ),
+              ],
             'name' =>
-              array(
+              [
                 'id' => 'name',
                 'table' => 'media_field_data',
                 'field' => 'name',
@@ -387,7 +388,7 @@ function lightning_media_update_8008() {
                 'group' => 1,
                 'exposed' => TRUE,
                 'expose' =>
-                  array(
+                  [
                     'operator_id' => 'name_op',
                     'label' => 'Keywords',
                     'description' => '',
@@ -398,7 +399,7 @@ function lightning_media_update_8008() {
                     'remember' => 0,
                     'multiple' => FALSE,
                     'remember_roles' =>
-                      array(
+                      [
                         'authenticated' => 'authenticated',
                         'anonymous' => 0,
                         'administrator' => 0,
@@ -409,11 +410,11 @@ function lightning_media_update_8008() {
                         'landing_page_reviewer' => 0,
                         'media_creator' => 0,
                         'media_manager' => 0,
-                      ),
-                  ),
+                      ],
+                  ],
                 'is_grouped' => FALSE,
                 'group_info' =>
-                  array(
+                  [
                     'label' => '',
                     'description' => '',
                     'identifier' => '',
@@ -423,16 +424,16 @@ function lightning_media_update_8008() {
                     'remember' => FALSE,
                     'default_group' => 'All',
                     'default_group_multiple' =>
-                      array(),
+                      [],
                     'group_items' =>
-                      array(),
-                  ),
+                      [],
+                  ],
                 'entity_type' => 'media',
                 'entity_field' => 'name',
                 'plugin_id' => 'string',
-              ),
+              ],
             'bundle' =>
-              array(
+              [
                 'id' => 'bundle',
                 'table' => 'media_field_data',
                 'field' => 'bundle',
@@ -441,11 +442,11 @@ function lightning_media_update_8008() {
                 'admin_label' => '',
                 'operator' => 'in',
                 'value' =>
-                  array(),
+                  [],
                 'group' => 1,
                 'exposed' => TRUE,
                 'expose' =>
-                  array(
+                  [
                     'operator_id' => 'bundle_op',
                     'label' => 'Type',
                     'description' => '',
@@ -456,7 +457,7 @@ function lightning_media_update_8008() {
                     'remember' => 0,
                     'multiple' => 0,
                     'remember_roles' =>
-                      array(
+                      [
                         'authenticated' => 'authenticated',
                         'anonymous' => 0,
                         'administrator' => 0,
@@ -467,12 +468,12 @@ function lightning_media_update_8008() {
                         'landing_page_reviewer' => 0,
                         'media_creator' => 0,
                         'media_manager' => 0,
-                      ),
+                      ],
                     'reduce' => 0,
-                  ),
+                  ],
                 'is_grouped' => FALSE,
                 'group_info' =>
-                  array(
+                  [
                     'label' => '',
                     'description' => '',
                     'identifier' => '',
@@ -482,16 +483,16 @@ function lightning_media_update_8008() {
                     'remember' => FALSE,
                     'default_group' => 'All',
                     'default_group_multiple' =>
-                      array(),
+                      [],
                     'group_items' =>
-                      array(),
-                  ),
+                      [],
+                  ],
                 'entity_type' => 'media',
                 'entity_field' => 'bundle',
                 'plugin_id' => 'bundle',
-              ),
+              ],
             'field_media_in_library_value' =>
-              array(
+              [
                 'id' => 'field_media_in_library_value',
                 'table' => 'media__field_media_in_library',
                 'field' => 'field_media_in_library_value',
@@ -503,7 +504,7 @@ function lightning_media_update_8008() {
                 'group' => 1,
                 'exposed' => FALSE,
                 'expose' =>
-                  array(
+                  [
                     'operator_id' => '',
                     'label' => '',
                     'description' => '',
@@ -514,13 +515,13 @@ function lightning_media_update_8008() {
                     'remember' => FALSE,
                     'multiple' => FALSE,
                     'remember_roles' =>
-                      array(
+                      [
                         'authenticated' => 'authenticated',
-                      ),
-                  ),
+                      ],
+                  ],
                 'is_grouped' => FALSE,
                 'group_info' =>
-                  array(
+                  [
                     'label' => '',
                     'description' => '',
                     'identifier' => '',
@@ -530,25 +531,25 @@ function lightning_media_update_8008() {
                     'remember' => FALSE,
                     'default_group' => 'All',
                     'default_group_multiple' =>
-                      array(),
+                      [],
                     'group_items' =>
-                      array(),
-                  ),
+                      [],
+                  ],
                 'plugin_id' => 'boolean',
-              ),
-          ),
+              ],
+          ],
         'filter_groups' =>
-          array(
+          [
             'operator' => 'AND',
             'groups' =>
-              array(
+              [
                 1 => 'AND',
-              ),
-          ),
+              ],
+          ],
         'empty' =>
-          array(
+          [
             'area_text_custom' =>
-              array(
+              [
                 'id' => 'area_text_custom',
                 'table' => 'views',
                 'field' => 'area_text_custom',
@@ -559,24 +560,24 @@ function lightning_media_update_8008() {
                 'tokenize' => 0,
                 'content' => 'There are no media items to display.',
                 'plugin_id' => 'text_custom',
-              ),
-          ),
+              ],
+          ],
         'pager' =>
-          array(
+          [
             'type' => 'infinite_scroll',
             'options' =>
-              array(
+              [
                 'items_per_page' => 12,
                 'offset' => '0',
                 'id' => '0',
                 'total_pages' => '',
                 'tags' =>
-                  array(
+                  [
                     'previous' => '‹ Previous',
                     'next' => 'Next ›',
-                  ),
+                  ],
                 'expose' =>
-                  array(
+                  [
                     'items_per_page' => 0,
                     'items_per_page_label' => 'Items per page',
                     'items_per_page_options' => '5, 10, 25, 50',
@@ -584,32 +585,83 @@ function lightning_media_update_8008() {
                     'items_per_page_options_all_label' => '- All -',
                     'offset' => 0,
                     'offset_label' => 'Offset',
-                  ),
+                  ],
                 'views_infinite_scroll' =>
-                  array(
+                  [
                     'button_text' => 'Load More',
                     'automatically_load_content' => 0,
-                  ),
-              ),
-          ),
+                  ],
+              ],
+          ],
         'display_description' => '',
         'css_class' => 'eb-media',
-      ),
+        'arguments' => [
+          'bundle' => [
+            'id' => 'bundle',
+            'table' => 'media_field_data',
+            'field' => 'bundle',
+            'relationship' => 'none',
+            'group_type' => 'group',
+            'admin_label' => '',
+            'default_action' => 'default',
+            'exception' => [
+              'value' => 'all',
+              'title_enable' => FALSE,
+              'title' => 'All',
+            ],
+            'title_enable' => FALSE,
+            'title' => '',
+            'default_argument_type' => 'entity_browser_widget_context',
+            'default_argument_options' => [
+              'context_key' => 'target_bundles',
+              'fallback' => 'all',
+              'multiple' => 'or',
+            ],
+            'default_argument_skip_url' => FALSE,
+            'summary_options' => [
+              'base_path' => '',
+              'count' => TRUE,
+              'items_per_page' => 25,
+              'override' => FALSE,
+            ],
+            'summary' => [
+              'sort_order' => 'asc',
+              'number_of_records' => 0,
+              'format' => 'default_summary',
+            ],
+            'specify_validation' => FALSE,
+            'validate' => [
+              'type' => 'none',
+              'fail' => 'not found',
+            ],
+            'validate_options' => [],
+            'glossary' => FALSE,
+            'limit' => 0,
+            'case' => 'none',
+            'path_case' => 'none',
+            'transform_dash' => FALSE,
+            'break_phrase' => TRUE,
+            'entity_type' => 'media',
+            'entity_field' => 'bundle',
+            'plugin_id' => 'string',
+          ],
+        ],
+      ],
     'cache_metadata' =>
-      array(
+      [
         'max-age' => -1,
         'contexts' =>
-          array(
+          [
             0 => 'languages:language_content',
             1 => 'languages:language_interface',
             2 => 'url',
             3 => 'url.query_args',
             4 => 'user.permissions',
-          ),
+          ],
         'tags' =>
-          array(),
-      ),
-  ));
+          [],
+      ],
+  ]);
   $view->save();
 
   $browser = EntityBrowser::load('media_browser');
@@ -683,7 +735,7 @@ function lightning_media_update_8012() {
         // It's possible that the site owner took matters into their own hands
         // and configured the filter already, so only add it if it's not there.
         if (empty($display['filters']['field_media_in_library_value'])) {
-          $display['filters']['field_media_in_library_value'] = array(
+          $display['filters']['field_media_in_library_value'] = [
             'id' => 'field_media_in_library_value',
             'table' => 'media__field_media_in_library',
             'field' => 'field_media_in_library_value',
@@ -695,7 +747,7 @@ function lightning_media_update_8012() {
             'group' => 1,
             'exposed' => FALSE,
             'expose' =>
-              array(
+              [
                 'operator_id' => '',
                 'label' => '',
                 'description' => '',
@@ -706,13 +758,13 @@ function lightning_media_update_8012() {
                 'remember' => FALSE,
                 'multiple' => FALSE,
                 'remember_roles' =>
-                  array(
+                  [
                     'authenticated' => 'authenticated',
                   ),
               ),
             'is_grouped' => FALSE,
             'group_info' =>
-              array(
+              [
                 'label' => '',
                 'description' => '',
                 'identifier' => '',
@@ -722,9 +774,9 @@ function lightning_media_update_8012() {
                 'remember' => FALSE,
                 'default_group' => 'All',
                 'default_group_multiple' =>
-                  array(),
+                  [),
                 'group_items' =>
-                  array(),
+                  [),
               ),
             'plugin_id' => 'boolean',
           );
@@ -771,6 +823,87 @@ function lightning_media_update_8015() {
 }
 
 /**
+ * Adds a bundle contextual filter to the media view's browser display.
+ */
+function lightning_media_update_8016() {
+  /** @var \Drupal\entity_browser\EntityBrowserInterface $browser */
+  $browser = EntityBrowser::load('media_browser');
+  if (empty($browser)) {
+    return;
+  }
+
+  /** @var \Drupal\entity_browser\WidgetInterface $widget */
+  foreach ($browser->getWidgets() as $widget) {
+    if ($widget->getPluginId() == 'view') {
+      $configuration = $widget->getConfiguration();
+
+      if ($configuration['settings']['view'] === 'media') {
+        /** @var \Drupal\views\ViewEntityInterface $view */
+        $view = View::load('media');
+        // Reference the display options directly, for readability.
+        $display = &$view->getDisplay($configuration['settings']['view_display'])['display_options'];
+        // Only add the bundle argument is it is not already set.
+        if (!isset($display['display_options']['arguments']['bundle'])) {
+          if (!isset($display['display_options']['defaults']['arguments'])) {
+            $display['display_options']['defaults']['arguments'] = FALSE;
+          }
+          $display['display_options']['arguments']['bundle'] = [
+            'id' => 'bundle',
+            'table' => 'media_field_data',
+            'field' => 'bundle',
+            'relationship' => 'none',
+            'group_type' => 'group',
+            'admin_label' => '',
+            'default_action' => 'default',
+            'exception' => [
+              'value' => 'all',
+              'title_enable' => FALSE,
+              'title' => 'All',
+            ],
+            'title_enable' => FALSE,
+            'title' => '',
+            'default_argument_type' => 'entity_browser_widget_context',
+            'default_argument_options' => [
+              'context_key' => 'target_bundles',
+              'fallback' => 'all',
+              'multiple' => 'or',
+            ],
+            'default_argument_skip_url' => FALSE,
+            'summary_options' => [
+              'base_path' => '',
+              'count' => TRUE,
+              'items_per_page' => 25,
+              'override' => FALSE,
+            ],
+            'summary' => [
+              'sort_order' => 'asc',
+              'number_of_records' => 0,
+              'format' => 'default_summary',
+            ],
+            'specify_validation' => FALSE,
+            'validate' => [
+              'type' => 'none',
+              'fail' => 'not found',
+            ],
+            'validate_options' => [],
+            'glossary' => FALSE,
+            'limit' => 0,
+            'case' => 'none',
+            'path_case' => 'none',
+            'transform_dash' => FALSE,
+            'break_phrase' => TRUE,
+            'entity_type' => 'media',
+            'entity_field' => 'bundle',
+            'plugin_id' => 'string',
+          ];
+        }
+        $view->save();
+      }
+    }
+  }
+}
+
+/**
  * Implements hook_update_dependencies().
  */
 function lightning_media_update_dependencies() {
@@ -784,6 +917,9 @@ function lightning_media_update_dependencies() {
       8012 => [
         'lightning_media' => 8008,
       ],
+      8016 => [
+        'lightning_media' => 8008,
+      ],
     ],
   ];
 }
