1 files changed, 6 insertions, 1 deletions
diff --git a/src/ui/components/Menu.cpp b/src/ui/components/Menu.cpp
index 60364f13..681b44b7 100644
--- a/src/ui/components/Menu.cpp
+++ b/src/ui/components/Menu.cpp
@@ -79,7 +79,10 @@ void Menu::ClearItems() {
 void Menu::AddTextItem(String text, gsl::index index,
                        std::function<void()> on_click) {
   MenuItem* item = new MenuItem(std::move(text));
-  item->SetOnClick(std::move(on_click));
+  item->SetOnClick([this, index, on_click = std::move(on_click)] {
+    on_click();
+    if (on_item_click_) on_item_click_(index);
+  });
   AddItem(item, index);
 }
 
@@ -89,6 +92,8 @@ PopupMenu::PopupMenu(controls::Control* attached_control)
 
   menu_ = new Menu();
 
+  menu_->SetOnItemClick([this](Index _) { this->Close(); });
+
   popup_->AddChild(menu_->GetRootControl(), 0);
 }