1 files changed, 6 insertions, 2 deletions
diff --git a/src/ui/controls/Popup.cpp b/src/ui/controls/Popup.cpp
index bc217bf5..515c7b31 100644
--- a/src/ui/controls/Popup.cpp
+++ b/src/ui/controls/Popup.cpp
@@ -8,15 +8,19 @@
 #include <memory>
 
 namespace cru::ui::controls {
-Popup::Popup(Control* attached_control) : RootControl(attached_control) {}
+Popup::Popup(Control* attached_control) : RootControl(attached_control) {
+  SetGainFocusOnCreateAndDestroyWhenLoseFocus(true);
+}
 
 Popup::~Popup() = default;
 
 gsl::not_null<platform::gui::INativeWindow*> Popup::CreateNativeWindow(
     gsl::not_null<host::WindowHost*> host,
     platform::gui::INativeWindow* parent) {
-  return host->CreateNativeWindow(
+  auto window = host->CreateNativeWindow(
       {parent, platform::gui::CreateWindowFlags::NoCaptionAndBorder});
+
+  return window;
 }
 
 }  // namespace cru::ui::controls