diff --git a/include/Engine/GUI/EButtonReleased.h b/include/Engine/GUI/EButtonReleased.h
index 90170518..ecd8dde2 100644
--- a/include/Engine/GUI/EButtonReleased.h
+++ b/include/Engine/GUI/EButtonReleased.h
@@ -7,6 +7,7 @@ namespace Events
 {
 
 struct ButtonReleased : public Event {
+    std::string EntityName;
     EntityWrapper Entity;
 };
 
diff --git a/src/Engine/GUI/ButtonSystem.cpp b/src/Engine/GUI/ButtonSystem.cpp
index 7c66e456..93ae1811 100644
--- a/src/Engine/GUI/ButtonSystem.cpp
+++ b/src/Engine/GUI/ButtonSystem.cpp
@@ -56,7 +56,8 @@ bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
             EntityWrapper ent = EntityWrapper(m_World, m_PickData.Entity);
 
             Events::ButtonReleased eReleased;
-            eReleased.Entity = ent;
+            eReleased.EntityName = m_PickEntity.Name();
+            eReleased.Entity = m_PickEntity;
             m_EventBroker->Publish(eReleased);
 
             if(m_World->HasComponent(m_PickData.Entity, "Button")) {