diff --git a/[refs] b/[refs]
index d1bcbedadba3..64250c3c3139 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0597fcd08b858df83b9f20afd6035311d92c48f8
+refs/heads/master: 39177ec36236fb71257e51d0d198437b84170911
diff --git a/trunk/scripts/kconfig/nconf.c b/trunk/scripts/kconfig/nconf.c
index eda49ffc1c8c..db56377393d7 100644
--- a/trunk/scripts/kconfig/nconf.c
+++ b/trunk/scripts/kconfig/nconf.c
@@ -1266,9 +1266,13 @@ static void conf_choice(struct menu *menu)
 			if (child->sym == sym_get_choice_value(menu->sym))
 				item_make(child, ':', "<X> %s",
 						_(menu_get_prompt(child)));
-			else
+			else if (child->sym)
 				item_make(child, ':', "    %s",
 						_(menu_get_prompt(child)));
+			else
+				item_make(child, ':', "*** %s ***",
+						_(menu_get_prompt(child)));
+
 			if (child->sym == active){
 				last_top_row = top_row(curses_menu);
 				selected_index = i;
@@ -1334,7 +1338,7 @@ static void conf_choice(struct menu *menu)
 			break;
 
 		child = item_data();
-		if (!child || !menu_is_visible(child))
+		if (!child || !menu_is_visible(child) || !child->sym)
 			continue;
 		switch (res) {
 		case ' ':