Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h	(revision 75268)
@@ -104,5 +104,5 @@
         /** Prepares all.
           * @note Normally you don't need to reimplement it. */
-        void prepare();
+        virtual void prepare();
         /** Configures all.
           * @note Injected into prepare(), reimplement to configure all there. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h	(revision 75268)
@@ -68,4 +68,5 @@
 
 private:
+
     UIGuestControlFileManagerSettings();
     ~UIGuestControlFileManagerSettings();
@@ -170,4 +171,5 @@
     friend class UIGuestControlFileManagerSettingsPanel;
     friend class UIGuestControlFileManagerPanel;
+    friend class UIGuestControlFileManagerDialog;
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp	(revision 75268)
@@ -70,4 +70,10 @@
     , m_strMachineName(strMachineName)
 {
+}
+
+void UIGuestControlFileManagerDialog::prepare()
+{
+    QIManagerDialog::prepare();
+    manageEscapeShortCut();
 }
 
@@ -158,2 +164,10 @@
         button(ButtonType_Close)->setShortcut(shortcut);
 }
+
+void UIGuestControlFileManagerDialog::manageEscapeShortCut()
+{
+    UIGuestControlFileManager *pWidget = qobject_cast<UIGuestControlFileManager*>(widget());
+    if (!pWidget)
+        return;
+    pWidget->manageEscapeShortCut();
+}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.h	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.h	(revision 75268)
@@ -72,4 +72,5 @@
 protected:
 
+    virtual void prepare() /* override */;
     /** @name Event-handling stuff.
       * @{ */
@@ -105,4 +106,5 @@
 private:
 
+    void manageEscapeShortCut();
     UIActionPool *m_pActionPool;
     CGuest      m_comGuest;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp	(revision 75268)
@@ -72,4 +72,10 @@
     , m_comMachine(comMachine)
 {
+}
+
+void UIVMLogViewerDialog::prepare()
+{
+    QIManagerDialog::prepare();
+    manageEscapeShortCut();
 }
 
@@ -174,2 +180,10 @@
         button(ButtonType_Close)->setShortcut(shortcut);
 }
+
+void UIVMLogViewerDialog::manageEscapeShortCut()
+{
+    UIVMLogViewerWidget *pWidget = qobject_cast<UIVMLogViewerWidget*>(widget());
+    if (!pWidget)
+        return;
+    pWidget->manageEscapeShortCut();
+}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h	(revision 75268)
@@ -78,4 +78,5 @@
 protected:
 
+    virtual void prepare() /* override */;
     /** @name Event-handling stuff.
       * @{ */
@@ -112,4 +113,5 @@
 private:
 
+    void manageEscapeShortCut();
     /** Holds the action-pool reference. */
     UIActionPool *m_pActionPool;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h	(revision 75267)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h	(revision 75268)
@@ -232,4 +232,5 @@
     friend class UIVMLogViewerSettingsPanel;
     friend class UIVMLogViewerPanel;
+    friend class UIVMLogViewerDialog;
 };