diff --git a/webform.module b/webform.module
index 2a8f6d7..bb30007 100644
--- a/webform.module
+++ b/webform.module
@@ -860,10 +860,14 @@ function webform_webform_component_info() {
  * All webform_client_form forms share the same form handler
  */
 function webform_forms($form_id) {
+  module_load_include('inc', 'webform', 'includes/webform.components');
   $forms = array();
   if (strpos($form_id, 'webform_client_form_') === 0) {
     $forms[$form_id]['callback'] = 'webform_client_form';
   }
+  if (strpos($form_id, 'webform_component_edit_form') === 0) {
+    $forms[$form_id]['callback'] = 'webform_component_edit_form';
+  }
   return $forms;
 }