diff --git a/cms/static/js/views/validating_view.js b/cms/static/js/views/validating_view.js
index 041e779030..c3ea57fd20 100644
--- a/cms/static/js/views/validating_view.js
+++ b/cms/static/js/views/validating_view.js
@@ -25,11 +25,14 @@ CMS.Views.ValidatingView = Backbone.View.extend({
         for (var field in error) {
             var ele = this.$el.find('#' + this.fieldToSelectorMap[field]);
             this._cacheValidationErrors.push(ele);
-            if ($(ele).is('div')) {
-                // put error on the contained inputs
-                $(ele).find('input, textarea').addClass('error');
+            var inputElements = 'input, textarea';
+            if ($(ele).is(inputElements)) {
+                $(ele).addClass('error');
+            }
+            else {
+                // put error on the contained inputs
+                $(ele).find(inputElements).addClass('error');
             }
-            else $(ele).addClass('error');
             $(ele).parent().append(this.errorTemplate({message : error[field]}));
         }
     },