diff --git a/Runtime/Scripts/Controls/ImList.cs b/Runtime/Scripts/Controls/ImList.cs
index 947470e..4f25855 100644
--- a/Runtime/Scripts/Controls/ImList.cs
+++ b/Runtime/Scripts/Controls/ImList.cs
@@ -16,8 +16,10 @@ public static void BeginList(this ImGui gui, ImSize size = default)
 
         public static void BeginList(this ImGui gui, ImRect rect)
         {
+            var id = gui.GetNextControlId();
+
             gui.Box(rect, gui.Style.List.Box);
-            gui.RegisterRaycastTarget(rect);
+            gui.RegisterControl(id, rect);
 
             var layoutRect = rect.WithPadding(gui.Style.List.Padding);
             var maskRect = rect.WithPadding(gui.Style.List.Box.BorderThickness);
diff --git a/Runtime/Scripts/Controls/ImMenuBar.cs b/Runtime/Scripts/Controls/ImMenuBar.cs
index 74c8933..3b857bd 100644
--- a/Runtime/Scripts/Controls/ImMenuBar.cs
+++ b/Runtime/Scripts/Controls/ImMenuBar.cs
@@ -52,6 +52,8 @@ public static void BeginMenuBar(ImGui gui, uint id, ImRect rect, int order)
             gui.Layout.Push(ImAxis.Horizontal, rect);
             gui.Canvas.PushOrder(order);
 
+            gui.RegisterControl(id, rect);
+
             gui.Box(rect, in gui.Style.MenuBar.Box);
         }
 
diff --git a/Runtime/Scripts/Controls/ImPopup.cs b/Runtime/Scripts/Controls/ImPopup.cs
index cbec70f..ea0f6d7 100644
--- a/Runtime/Scripts/Controls/ImPopup.cs
+++ b/Runtime/Scripts/Controls/ImPopup.cs
@@ -42,7 +42,6 @@ public static bool CloseButton(ImGui gui, int order)
         {
             gui.Canvas.PushNoClipRect();
             gui.Canvas.PushOrder(order);
-            gui.RegisterRaycastTarget(gui.Canvas.ScreenRect);
 
             var id = gui.GetNextControlId();