diff --git a/core/misc/states.js b/core/misc/states.js
index fa7a1017523..8883bca2d45 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -18,10 +18,11 @@ var states = Drupal.states = {
  */
 Drupal.behaviors.states = {
   attach: function (context, settings) {
+    var $context = $(context);
     for (var selector in settings.states) {
       for (var state in settings.states[selector]) {
         new states.Dependent({
-          element: $(selector),
+          element: $context.find(selector),
           state: states.State.sanitize(state),
           constraints: settings.states[selector][state]
         });