diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index d27a463b..2463aec6 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -199,6 +199,7 @@ bool EditorSystem::OnPicking(const Events::Picking& e)
                     //auto selectionTransform = m_World->GetComponent(m_Selection, "Transform");
                     //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"];
                 } else {
+                    ImGui::SetActiveID(0, nullptr);
                     m_Selection = entity;
                     setWidgetMode(m_WidgetMode);
                 }