diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp
index 7c997b783..388ae1d35 100644
--- a/aegisub/frame_main.cpp
+++ b/aegisub/frame_main.cpp
@@ -91,6 +91,8 @@ FrameMain::FrameMain (wxArrayString args)
 	// Set application's frame
 	AegisubApp::Get()->frame = this;
 
+	LogWindow = new wxLogWindow(this, _T("Aegisub log window"), false);
+
 	// Initialize flags
 	HasSelection = false;
 	menuCreated = false;
@@ -420,6 +422,7 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(viewMenu,Menu_View_Language, _T("&Language..."), _("Select Aegisub interface language"), wxBITMAP(blank_button));
 	AppendBitmapMenuItem(viewMenu,Menu_Tools_Options, _("&Options...") + wxString(_T("\t")) + Hotkeys.GetText(_T("Options")), _("Configure Aegisub"), wxBITMAP(options_button));
 	AppendBitmapMenuItem(viewMenu,Menu_Tools_Hotkeys, _("&Hotkeys..."), _("Remap hotkeys"), wxBITMAP(hotkeys_button));
+	AppendBitmapMenuItem(viewMenu,Menu_Tools_Log, _("Lo&g window..."), _("Open log window"), wxBITMAP(blank_button));
 	viewMenu->AppendSeparator();
 	viewMenu->AppendRadioItem(Menu_View_Subs, _("Subs only view"), _("Display subtitles only"));
 	viewMenu->AppendRadioItem(Menu_View_Video, _("Video+Subs view"), _("Display video and subtitles only"));
diff --git a/aegisub/frame_main.h b/aegisub/frame_main.h
index bfb99e843..543582e29 100644
--- a/aegisub/frame_main.h
+++ b/aegisub/frame_main.h
@@ -99,6 +99,7 @@ private:
 	wxComboBox *ZoomBox;
 
 	wxWindow *PreviousFocus;
+	wxLogWindow *LogWindow;
 
 	Automation4::ScriptManager *local_scripts;
 
@@ -205,6 +206,7 @@ private:
 	void OnOpenKanjiTimer (wxCommandEvent &event);
 	void OnOpenHotkeys (wxCommandEvent &event);
 	void OnOpenOptions (wxCommandEvent &event);
+	void OnOpenLog (wxCommandEvent &event);
 	void OnGridEvent (wxCommandEvent &event);
 
 	void OnOpenAutomation (wxCommandEvent &event);
@@ -361,6 +363,7 @@ enum {
 	Menu_Tools_Kanji_Timer,
 	Menu_Tools_Hotkeys,
 	Menu_Tools_Options,
+	Menu_Tools_Log,
 
 	Menu_Help_Contents,
 	Menu_Help_IRCChannel,
diff --git a/aegisub/frame_main_events.cpp b/aegisub/frame_main_events.cpp
index 161f7b2c3..ecf562e43 100644
--- a/aegisub/frame_main_events.cpp
+++ b/aegisub/frame_main_events.cpp
@@ -171,6 +171,7 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
 	EVT_MENU(Menu_Tools_Kanji_Timer, FrameMain::OnOpenKanjiTimer)
 	EVT_MENU(Menu_Tools_Hotkeys, FrameMain::OnOpenHotkeys)
 	EVT_MENU(Menu_Tools_Options, FrameMain::OnOpenOptions)
+	EVT_MENU(Menu_Tools_Log, FrameMain::OnOpenLog)
 	
 	EVT_MENU(Menu_Subs_Snap_Start_To_Video, FrameMain::OnSnapSubsStartToVid)
 	EVT_MENU(Menu_Subs_Snap_End_To_Video, FrameMain::OnSnapSubsEndToVid)
@@ -998,6 +999,13 @@ void FrameMain::OnOpenOptions (wxCommandEvent &event) {
 }
 
 
+//////////////////
+// Open log window
+void FrameMain::OnOpenLog (wxCommandEvent &event) {
+	LogWindow->Show(true);
+}
+
+
 ///////////////////
 // Open Automation
 void FrameMain::OnOpenAutomation (wxCommandEvent &event) {