diff --git a/[refs] b/[refs]
index 259bfe31b9bf..991ba19c93f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786fb18d015cc5f34284d426e055ddd7a3dbb53b
+refs/heads/master: f253f00003c3fed0355cf49482f24c56bc5dbea6
diff --git a/trunk/scripts/kconfig/qconf.cc b/trunk/scripts/kconfig/qconf.cc
index 99124458dbd5..0981d2a2f363 100644
--- a/trunk/scripts/kconfig/qconf.cc
+++ b/trunk/scripts/kconfig/qconf.cc
@@ -1472,7 +1472,10 @@ void ConfigMainWindow::searchConfig(void)
 void ConfigMainWindow::changeMenu(struct menu *menu)
 {
 	configList->setRootMenu(menu);
-	backAction->setEnabled(TRUE);
+	if (configList->rootEntry->parent == &rootmenu)
+		backAction->setEnabled(FALSE);
+	else
+		backAction->setEnabled(TRUE);
 }
 
 void ConfigMainWindow::setMenuLink(struct menu *menu)