1 files changed, 7 insertions, 0 deletions

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 73ce56a76271..91b7e6fbc364 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -400,6 +400,9 @@ void ConfigList::updateSelection(void)
         struct menu *menu;
         enum prop_type type;
 
+        if (selectedItems().count() == 0)
+                return;
+
         ConfigItem* item = (ConfigItem*)selectedItems().first();
         if (!item)
                 return;
@@ -1624,6 +1627,10 @@ void ConfigMainWindow::goBack(void)
         configList->setParentMenu();
         if (configList->rootEntry == &rootmenu)
                 backAction->setEnabled(false);
+
+        if (menuList->selectedItems().count() == 0)
+                return;
+
         item = (ConfigItem*)menuList->selectedItems().first();
         oldSelection = item;
         while (item) {