diff --git a/obs/window-main-basic.cpp b/obs/window-main-basic.cpp
index 41f23a260..e5471a152 100644
--- a/obs/window-main-basic.cpp
+++ b/obs/window-main-basic.cpp
@@ -65,6 +65,7 @@ void OBSBasic::file_saveOnMenuSelection(wxCommandEvent& event)
 
 void OBSBasic::file_exitOnMenuSelection(wxCommandEvent& event)
 {
+	wxGetApp().ExitMainLoop();
 }
 
 void OBSBasic::scenesOnRightDown(wxMouseEvent& event)
@@ -114,3 +115,8 @@ void OBSBasic::sourceUpOnToolClicked(wxCommandEvent& event)
 void OBSBasic::sourceDownOnToolClicked(wxCommandEvent& event)
 {
 }
+
+void OBSBasic::exitButtonOnButtonClick(wxCommandEvent& event)
+{
+	wxGetApp().ExitMainLoop();
+}
diff --git a/obs/window-main-basic.hpp b/obs/window-main-basic.hpp
index b514c9363..956135f59 100644
--- a/obs/window-main-basic.hpp
+++ b/obs/window-main-basic.hpp
@@ -40,6 +40,7 @@ protected:
 	virtual void sourcePropertiesOnToolClicked(wxCommandEvent& event);
 	virtual void sourceUpOnToolClicked(wxCommandEvent& event);
 	virtual void sourceDownOnToolClicked(wxCommandEvent& event);
+	virtual void exitButtonOnButtonClick(wxCommandEvent& event);
 
 public:
 	inline OBSBasic() : OBSBasicBase(NULL) {}