diff --git a/docs/changes.txt b/docs/changes.txt
index b69a7c5bb8..812427cf1a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -578,6 +578,7 @@ All (GUI):
 - Make TAB behaviour in wxGrid more flexible (Fulvio Senore).
 - Add missing styles support to wxWindow XRC hanlder (Steffen Olszewski).
 - Allow specifying all wxFlexGridSizer parameters in XRC (Steffen Olszewski).
+- Close wxLogWindow automatically if it's the last remaining top level window.
 
 wxGTK:
 
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index db877a0e00..a56044a05f 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -448,6 +448,9 @@ public:
     wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle);
     virtual ~wxLogFrame();
 
+    // Don't prevent the application from exiting if just this frame remains.
+    virtual bool ShouldPreventAppExit() const { return false; }
+
     // menu callbacks
     void OnClose(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);