diff --git a/includes/MediaInternetYouTubeHandler.inc b/includes/MediaInternetYouTubeHandler.inc
index a580973..24ea3fc 100644
--- a/includes/MediaInternetYouTubeHandler.inc
+++ b/includes/MediaInternetYouTubeHandler.inc
@@ -70,6 +70,11 @@ class MediaInternetYouTubeHandler extends MediaInternetBaseHandler {
     // Try to default the file name to the video's title.
     if (empty($file->fid) && $info = $this->getOEmbed()) {
       $file->filename = truncate_utf8($info['title'], 255);
+      foreach (array('width', 'height') as $setting) {
+        if (!empty($info[$setting])) {
+          $file->metadata[$setting] = $info[$setting];
+        }
+      }
     }
 
     return $file;
diff --git a/includes/media_youtube.formatters.inc b/includes/media_youtube.formatters.inc
index 639a339..b939c99 100644
--- a/includes/media_youtube.formatters.inc
+++ b/includes/media_youtube.formatters.inc
@@ -68,7 +68,8 @@ function media_youtube_file_formatter_video_view($file, $display, $langcode) {
     $display['settings']['attributes'] = array();
 
     foreach (array('width', 'height', 'autohide', 'autoplay', 'color', 'enablejsapi', 'loop', 'modestbranding', 'nocookie', 'origin', 'protocol', 'protocol_specify', 'rel', 'showinfo', 'theme', 'attributes', 'captions','controls') as $setting) {
-      $element['#options'][$setting] = isset($file->override[$setting]) ? $file->override[$setting] : $display['settings'][$setting];
+      $element['#options'][$setting] = isset($file->metadata[$setting]) ? $file->metadata[$setting]
+        : (isset($file->override[$setting]) ? $file->override[$setting] : $display['settings'][$setting]);
     }
 
     return $element;