diff -u remote_stream_wrapper-7.x-1.0-rc1/remote_stream_wrapper.module remote_stream_wrapper/remote_stream_wrapper.module
--- remote_stream_wrapper-7.x-1.0-rc1/remote_stream_wrapper.module	2014-04-21 19:29:49.000000000 -0500
+++ remote_stream_wrapper/remote_stream_wrapper.module	2015-04-13 21:22:05.120122298 -0500
@@ -198,13 +198,25 @@
  * Implements hook_media_browser_plugin_info().
  */
 function remote_stream_wrapper_media_browser_plugin_info() {
-  $plugins['remote_file'] = array(
-    'title' => t('Remote URL'),
-    'class' => 'RemoteStreamWrapperMediaBrowser',
-    // Support for Media 1.x browser plugin API.
-    '#title' => t('Remote URL'),
-    'access callback' => 'remote_stream_wrapper_media_browser_plugin_access',
-  );
+  $media_version = &drupal_static(__FUNCTION__);
+  if(!$media_version) {
+    $media_info = system_get_info('module', 'media');
+    list($core,$media_version) = explode('-', $media_info['version']);
+    $media_version += 0;
+  }
+  
+  if($media_version < 2) {
+    $plugins['remote_file'] = array();  
+  } else {
+    $plugins['remote_file'] = array(
+      'title' => t('Remote URL'),
+      'class' => 'RemoteStreamWrapperMediaBrowser',
+      // Support for Media 1.x browser plugin API.
+      '#title' => t('Remote URL'),
+      'access callback' => 'remote_stream_wrapper_media_browser_plugin_access',
+    );
+  }
+  
   return $plugins;
 }
 
@@ -251,6 +263,8 @@
   // @todo Validate against file field allowed types.
   $form['#validators'] = array();
 
+  $form['#render'] = isset($options['render']) && $options['render'] == 'media-popup' ? 'media-popup' : 'standalone';
+
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
@@ -289,15 +303,20 @@
     $form_state['file'] = $file;
   }
 
-  if (drupal_valid_path('file/' . $file->fid . '/edit')) {
-    $destination = array('destination' => 'admin/content/file');
-    if (isset($_GET['destination'])) {
-      $destination = drupal_get_destination();
-      unset($_GET['destination']);
+  if ($form['#render'] == 'standalone') {
+    if (drupal_valid_path('file/' . $file->fid . '/edit')) {
+      $destination = array('destination' => 'admin/content/file');
+      if (isset($_GET['destination'])) {
+        $destination = drupal_get_destination();
+        unset($_GET['destination']);
+      }
+      $form_state['redirect'] = array('file/' . $file->fid . '/edit', array('query' => $destination));
+    }
+    else {
+      $form_state['redirect'] = 'admin/content/file';
     }
-    $form_state['redirect'] = array('file/' . $file->fid . '/edit', array('query' => $destination));
   }
-  else {
-    $form_state['redirect'] = 'admin/content/file';
+  else if ($form['#render'] == 'media-popup') {
+    $form_state['redirect'] = array('media/browser', array('query' => array('render' => 'media-popup', 'fid' => $file->fid)));
   }
 }