diff --git a/webform_component_roles.module b/webform_component_roles.module
index 1124d04..c16ffcb 100644
--- a/webform_component_roles.module
+++ b/webform_component_roles.module
@@ -342,3 +342,17 @@ function _webform_component_roles_flatten_components(&$element, &$elements) {
     }
   }
 }
+
+/**
+ * Implements hook_node_load().
+ */
+function webform_component_roles_node_load($nodes, $types) {
+  foreach ($nodes as $node) {
+    if (isset($node->webform['components'])) {
+      foreach ($node->webform['components'] as &$component) {
+        $roles = _webform_component_roles_component_roles($component['nid'], $component['cid']);
+        $component['role_control']['roles'] = array_combine($roles, $roles);
+      }
+    }
+  }
+}