diff --git a/src/gen/ui_class.cpp b/src/gen/ui_class.cpp
index dcbeb7437..757745e3d 100644
--- a/src/gen/ui_class.cpp
+++ b/src/gen/ui_class.cpp
@@ -63,10 +63,12 @@ static std::string convert_type(const std::string& name)
   if (name == "link") return "ui::LinkLabel";
   if (name == "listbox") return "ui::ListBox";
   if (name == "panel") return "ui::Panel";
+  if (name == "popupwindow") return "ui::PopupWindow";
   if (name == "radio") return "ui::RadioButton";
   if (name == "search") return "app::SearchEntry";
   if (name == "slider") return "ui::Slider";
   if (name == "splitter") return "ui::Splitter";
+  if (name == "tipwindow") return "ui::TipWindow";
   if (name == "vbox") return "ui::VBox";
   if (name == "view") return "ui::View";
   if (name == "window") return "ui::Window";
diff --git a/src/ui/popup_window.h b/src/ui/popup_window.h
index 390719f1e..b2104d501 100644
--- a/src/ui/popup_window.h
+++ b/src/ui/popup_window.h
@@ -25,8 +25,8 @@ namespace ui {
       CloseOnEnter,
     };
 
-    PopupWindow(const std::string& text,
-                ClickBehavior clickBehavior,
+    PopupWindow(const std::string& text = "",
+                ClickBehavior clickBehavior = ClickBehavior::CloseOnClickOutsideHotRegion,
                 EnterBehavior enterBehavior = EnterBehavior::CloseOnEnter);
     ~PopupWindow();