diff --git a/include/Nazara/Utility/EventHandler.hpp b/include/Nazara/Utility/EventHandler.hpp
index b35ef96cf..2464d5e72 100644
--- a/include/Nazara/Utility/EventHandler.hpp
+++ b/include/Nazara/Utility/EventHandler.hpp
@@ -18,12 +18,13 @@ namespace Nz
 	{
 		public:
 			EventHandler() = default;
-			EventHandler(const EventHandler&);
+			explicit EventHandler(const EventHandler&);
 			EventHandler(EventHandler&&) = default;
 			~EventHandler() = default;
 
 			inline void Dispatch(const WindowEvent& event);
 
+			NazaraSignal(OnEvent, const EventHandler* /*eventHandler*/, const WindowEvent& /*event*/);
 			NazaraSignal(OnGainedFocus, const EventHandler* /*eventHandler*/);
 			NazaraSignal(OnLostFocus, const EventHandler* /*eventHandler*/);
 			NazaraSignal(OnKeyPressed, const EventHandler* /*eventHandler*/, const WindowEvent::KeyEvent& /*event*/);
diff --git a/include/Nazara/Utility/EventHandler.inl b/include/Nazara/Utility/EventHandler.inl
index 4fadf6b43..c066b6810 100644
--- a/include/Nazara/Utility/EventHandler.inl
+++ b/include/Nazara/Utility/EventHandler.inl
@@ -14,6 +14,8 @@ namespace Nz
 
 	inline void EventHandler::Dispatch(const WindowEvent& event)
 	{
+		OnEvent(this, event);
+
 		switch (event.type)
 		{
 			case WindowEventType_GainedFocus: