diff --git a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
index b0ff76e2..be02a86e 100644
--- a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
+++ b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
@@ -504,6 +504,10 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
 				'label' => $this->_('Number of children'),
 				'sanitizer' => 'integer',
 			),
+			'children.' => array(
+				'input' => 'subfields',
+				'label' => $this->_x('Children',' children-with-subfield'),
+			),
 			'parent' => array(
 				'input' => 'number', // select
 				'label' => $this->_x('Parent', 'parent-only'),
@@ -1514,8 +1518,25 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
 
 		if($fieldName == 'parent' || $fieldName == 'children') {
 			// for parent or children, use the existing functionality in renderSelectField
-			
-			$fields = $this->wire('fields'); 
+	
+			if($fieldName === 'children') {
+				/** @var Templates $templates */
+				$fields = array();
+				$initTemplates = $this->getTemplatesFromInitValue($this->initValue);
+				foreach($initTemplates as $template) {
+					if(!$template instanceof Template) {
+						$template = $this->wire()->templates->get($template);
+					}
+					if(!$template) continue;
+					foreach($template->childTemplates() as $t) {
+						foreach($t->fieldgroup as $field) {
+							$fields[$field->name] = $field;
+						}
+					}
+				}
+			} else {
+				$fields = $this->wire()->fields;
+			}
 			$out = $this->renderSelectField(array(
 				'name' => 'subfield', 
 				'class' => 'select-subfield', 
@@ -1525,7 +1546,7 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
 				'customFields' => $fields,
 				'exclude' => array(), // prevent exclusion of 'count'
 				'prepend' => 
-					"<option value='parent' class='select-subfield-default' data-name='$valueName' data-label='$valueLabel'>" . 
+					"<option value='$fieldName' class='select-subfield-default' data-name='$valueName' data-label='$valueLabel'>" . 
 					$valueLabel . 
 					"</option>",
 			), $selectedValue);