Index: mythvideo/mythvideo/videodlg.cpp
===================================================================
--- mythvideo/mythvideo/videodlg.cpp	(revision 23073)
+++ mythvideo/mythvideo/videodlg.cpp	(working copy)
@@ -2679,6 +2679,7 @@
         else if (action == "ESCAPE")
         {
             if (m_d->m_type != DLG_TREE
+		&& !GetMythMainWindow()->IsExitingToMain()
                     && m_d->m_currentNode != m_d->m_rootNode)
                 handled = goBack();
             else