Index: libs/libmyth/settings.cpp
===================================================================
--- libs/libmyth/settings.cpp	(revision 12630)
+++ libs/libmyth/settings.cpp	(working copy)
@@ -1540,7 +1540,6 @@
     switch(e->key()) {
     case Key_Escape:
         reject();
-        emit popupDone();
         break;
     default:
         MythDialog::keyPressEvent(e);
Index: libs/libmyth/mythdialogs.cpp
===================================================================
--- libs/libmyth/mythdialogs.cpp	(revision 12630)
+++ libs/libmyth/mythdialogs.cpp	(working copy)
@@ -438,7 +438,7 @@
 
         if ((action == "ESCAPE") || (arrowAccel && action == "LEFT"))
         {
-            emit popupDone();
+            reject();
             handled = true;
         }
     }
@@ -505,7 +505,6 @@
 
 void MythPopupBox::defaultExitHandler()
 {
-    done(-1);
 }
 
 void MythPopupBox::showOkPopup(MythMainWindow *parent, QString title,