Index: tools/config.py
===================================================================
--- tools/config.py	(revision 839470fe57530d3817745bc3323d249dae216918)
+++ tools/config.py	(revision 45ab770b33b9c928aa6c222d73573bdb4795d228)
@@ -188,9 +188,12 @@
         if defopt:
             kw['default-item'] = choices[defopt][0] 
-        res,data = self.calldlg('--cancel-label',button[1],
+        res,data = self.calldlg('--extra-label',button[1],
+                                '--extra-button',
                                 '--menu',text,height,width,
                                 str(len(choices)),*args,**kw)
-        if res == 1:
+        if res == 3:
             return button[0]
+        if res == 1: # Cancel
+            sys.exit(1)
         elif res:
             print data