diff --git a/modules/core_lib/widgets/uicombobox.lua b/modules/core_lib/widgets/uicombobox.lua
index ef6b9aed..8329df3c 100644
--- a/modules/core_lib/widgets/uicombobox.lua
+++ b/modules/core_lib/widgets/uicombobox.lua
@@ -36,7 +36,8 @@ function UIComboBox:addOption(text, data)
 end
 
 function UIComboBox:onMousePress(mousePos, mouseButton)
-  local menu = createWidget(self:getStyleName() .. 'PopupMenu', self)
+  local menu = createWidget(self:getStyleName() .. 'PopupMenu')
+  menu:setId(self:getId() .. 'PopupMenu')
   for i,v in ipairs(self.options) do
     menu:addOption(v.text, function() self:setCurrentOption(v.text) end)
   end
diff --git a/src/framework/ui/uimanager.cpp b/src/framework/ui/uimanager.cpp
index 412825af..8844eb1b 100644
--- a/src/framework/ui/uimanager.cpp
+++ b/src/framework/ui/uimanager.cpp
@@ -92,7 +92,8 @@ void UIManager::inputEvent(const InputEvent& event)
                     if(UIWidgetPtr parent = widget->getParent())
                         parent->focusChild(widget, Fw::MouseFocusReason);
                 }
-                widget->onMousePress(event.mousePos, event.mouseButton);
+                if(widget->onMousePress(event.mousePos, event.mouseButton))
+                    break;
             }
 
             break;