diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index 6191bc9498..036f79efa2 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -335,6 +335,7 @@ void ImageGrid::mouseDown(wxMouseEvent& event)
         m_hit_item = hit.second;
         if (m_hit_type >= HIT_ACTION)
             Refresh();
+        SetFocus();
     }
 }
 
diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp
index b8c1b84cea..d2cd6797b1 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.cpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.cpp
@@ -219,7 +219,7 @@ void ComboBox::mouseDown(wxMouseEvent &event)
     } else if (drop.HasDismissLongTime()) {
         drop.autoPosition();
         drop_down = true;
-        drop.Popup();
+        drop.Popup(&drop);
         wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN);
         GetEventHandler()->ProcessEvent(e);
     }
diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp
index 14d1eb76ed..7d6f9dd8c5 100644
--- a/src/slic3r/GUI/Widgets/DropDown.cpp
+++ b/src/slic3r/GUI/Widgets/DropDown.cpp
@@ -50,7 +50,7 @@ DropDown::DropDown(wxWindow *             parent,
 void DropDown::Create(wxWindow *     parent,
          long           style)
 {
-    wxPopupTransientWindow::Create(parent);
+    wxPopupTransientWindow::Create(parent, wxPU_CONTAINS_CONTROLS);
     SetBackgroundStyle(wxBG_STYLE_PAINT);
     SetBackgroundColour(*wxWHITE);
     state_handler.attach({&border_color, &text_color, &selector_border_color, &selector_background_color});