diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index a1339198a1..c9d5953356 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -175,6 +175,8 @@ bool DolphinApp::OnInit()
 #ifdef _WIN32
 	EXTENDEDTRACEINITIALIZE(".");
 	SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
+#else
+	wxHandleFatalExceptions(true);
 #endif
 
 	// TODO: if First Boot
@@ -423,6 +425,11 @@ int DolphinApp::OnExit()
 	return wxApp::OnExit();
 }
 
+void DolphinApp::OnFatalException()
+{
+	WiimoteReal::Shutdown();
+}
+
 
 // ------------
 // Talk to GUI
diff --git a/Source/Core/DolphinWX/Src/Main.h b/Source/Core/DolphinWX/Src/Main.h
index aaff98719b..358b465253 100644
--- a/Source/Core/DolphinWX/Src/Main.h
+++ b/Source/Core/DolphinWX/Src/Main.h
@@ -28,6 +28,7 @@ public:
 	bool OnInit();
 	void OnEndSession();
 	int OnExit();
+	void OnFatalException();
 	CFrame* GetCFrame();
 	void InitLanguageSupport();