diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
index 836848cf46..70435b565d 100644
--- a/django/contrib/admin/media/css/forms.css
+++ b/django/contrib/admin/media/css/forms.css
@@ -345,6 +345,12 @@ li.inline-selector-item:hover {
     background-color: #C1DBFD;
 }
 
+.selector-error {
+    font-weight: bold;
+    border: 2px solid #F00000 !important;
+}
+
+
 .inline-detail {
     float: right;
     width: 80%;
diff --git a/django/contrib/admin/templates/admin/edit_inline/selector.html b/django/contrib/admin/templates/admin/edit_inline/selector.html
index d2175bd980..acb5afddcf 100644
--- a/django/contrib/admin/templates/admin/edit_inline/selector.html
+++ b/django/contrib/admin/templates/admin/edit_inline/selector.html
@@ -96,19 +96,33 @@
 <script type="text/javascript">
 $(function() {
     /* Selector */
-    $('.inline-detail .selector-item-detail').hide();
-    $('.inline-detail .selector-item-detail:first').show();
-    $('.inline-selector .inline-selector-item:first').addClass('inline-selected');
-    
-    $('.inline-selector-item').click(function () {
+    function select_inline(inline) {
         $('.inline-detail .selector-item-detail').hide();
         $('.inline-selector .inline-selector-item').removeClass('inline-selected');
 
-        $(this).addClass('inline-selected');
+        $(inline).addClass('inline-selected');
         
-        var div_to_show = '#' + $(this).find('a').attr('title');
+        var div_to_show = '#' + $(inline).find('a').attr('title');
         $(div_to_show).show();
-        
+    }
+    
+    $('.inline-detail .selector-item-detail').hide();
+    $('.inline-detail .selector-item-detail:first').show();
+    $('.inline-selector .inline-selector-item:first').addClass('inline-selected');
+    $('.form-row.errors').each(function() {
+        var id = $(this).parents('.selector-item-detail').attr('id').substring({{ inline_admin_formset.opts.verbose_name|length}});
+        $("#{{ inline_admin_formset.opts.verbose_name}}" + id + "-selector").addClass('selector-error');
+    });
+    
+    if ($('.form-row.errors').html()) {
+        select_inline('.selector-error:first');
+    }
+    else {
+        select_inline('.inline-selector-item:first');
+    }
+    
+    $('.inline-selector-item').click(function () {
+        select_inline(this);
         return false;
     });