diff --git a/js/media.browser.js b/js/media.browser.js
index 35cb9b1..d023a6b 100644
--- a/js/media.browser.js
+++ b/js/media.browser.js
@@ -26,7 +26,9 @@ Drupal.behaviors.experimentalMediaBrowser = {
     });

     $('.media-browser-tab').each( Drupal.media.browser.validateButtons );
-
+
+    // Will return focus to file name field
+    $('#media-tab-media_default--media_browser_1:visible').each(Drupal.media.browser.setFocusOnFileNameField);
   }
   // Wait for additional params to be passed in.
 };
@@ -35,6 +37,29 @@ Drupal.media.browser.launch = function () {
 
 };
 
+Drupal.media.browser.setFocusOnFileNameField = function() {
+  // When on "View Library" tab, give focus to file name field
+  var field = document.getElementById('edit-filename');
+  var pos = $(field).val().length;
+
+  // Set focus on field
+  $(field).focus();
+
+  // Set cursor position after last character
+  if (field) {
+    if (field.createTextRange) {
+      var textRange = field.createTextRange();
+      textRange.collapse(true);
+      textRange.moveEnd(pos);
+      textRange.moveStart(pos);
+      textRange.select();
+    }
+    else if (field.setSelectionRange) {
+      field.setSelectionRange(pos,pos);
+    }
+  }
+};
+
 Drupal.media.browser.validateButtons = function() {
   // The media browser runs in an IFRAME. The Drupal.media.popups.mediaBrowser()
   // function sets up the IFRAME and "OK" and "Cancel" buttons that are outside