diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp
index bdbdc82da4..d4d4e28c59 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.cpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.cpp
@@ -7,6 +7,7 @@ BEGIN_EVENT_TABLE(ComboBox, TextInput)
 
 EVT_LEFT_DOWN(ComboBox::mouseDown)
 //EVT_MOUSEWHEEL(ComboBox::mouseWheelMoved)
+EVT_KEY_DOWN(ComboBox::keyDown)
 
 // catch paint events
 END_EVENT_TABLE()
@@ -33,8 +34,7 @@ ComboBox::ComboBox(wxWindow *      parent,
     TextInput::Create(parent, "", value, (style & CB_NO_DROP_ICON) ? "" : "drop_down", pos, size,
                       style | wxTE_PROCESS_ENTER);
 
-    if (style & wxCB_READONLY)
-    {
+    if (style & wxCB_READONLY) {
         GetTextCtrl()->Hide();
         TextInput::SetFont(Label::Body_14);
         TextInput::SetBorderColor(StateColor(std::make_pair(0xDBDBDB, (int) StateColor::Disabled),
@@ -44,6 +44,8 @@ ComboBox::ComboBox(wxWindow *      parent,
         TextInput::SetBackgroundColor(StateColor(std::make_pair(0xF0F0F0, (int) StateColor::Disabled),
             std::make_pair(0xEDFAF2, (int) StateColor::Focused),
             std::make_pair(*wxWHITE, (int) StateColor::Normal)));
+    } else {
+        GetTextCtrl()->Bind(wxEVT_KEY_DOWN, &ComboBox::keyDown, this);
     }
     drop.Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &e) {
         SetSelection(e.GetInt());
@@ -56,7 +58,7 @@ ComboBox::ComboBox(wxWindow *      parent,
     drop.Bind(wxEVT_SHOW, [this](auto &e) {
         if (!e.IsShown()) {
             drop_down = false;
-            wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN);
+            wxCommandEvent e(wxEVT_COMBOBOX_CLOSEUP);
             GetEventHandler()->ProcessEvent(e);
         }
     });
@@ -212,9 +214,8 @@ void ComboBox::mouseDown(wxMouseEvent &event)
     } else if (drop.HasDismissLongTime()) {
         drop.autoPosition();
         drop_down = true;
-        drop.Show();
-        drop.Raise();
-        wxCommandEvent e(wxEVT_COMBOBOX_CLOSEUP);
+        drop.Popup(this);
+        wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN);
         GetEventHandler()->ProcessEvent(e);
     }
 }
@@ -231,12 +232,61 @@ void ComboBox::mouseWheelMoved(wxMouseEvent &event)
     }
 }
 
+void ComboBox::keyDown(wxKeyEvent& event) {
+    switch (event.GetKeyCode()) {
+        case WXK_RETURN:
+        case WXK_SPACE:
+            if (drop_down) {
+                drop.Hide();
+            } else if (drop.HasDismissLongTime()) {
+                drop.autoPosition();
+                drop_down = true;
+                drop.Popup(this);
+                wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN);
+                GetEventHandler()->ProcessEvent(e);
+            }
+            break;
+        case WXK_UP:
+        case WXK_DOWN:
+            if (event.GetKeyCode() == WXK_UP && GetSelection() > 0) {
+                SetSelection(GetSelection() - 1);
+            } else if (event.GetKeyCode() == WXK_DOWN && GetSelection() + 1 < texts.size()) {
+                SetSelection(GetSelection() + 1);
+            } else {
+                break;
+            }
+            {
+                wxCommandEvent e(wxEVT_COMBOBOX);
+                e.SetEventObject(this);
+                e.SetId(GetId());
+                e.SetInt(GetSelection());
+                GetEventHandler()->ProcessEvent(e);
+            }
+            break;
+        default:
+            event.Skip();
+            break;
+    }
+}
+
 void ComboBox::OnEdit()
 {
     auto value = GetTextCtrl()->GetValue();
     SetValue(value);
 }
 
+#ifdef __WIN32__
+
+WXLRESULT ComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    if (nMsg == WM_GETDLGCODE) {
+        return DLGC_WANTALLKEYS;
+    }
+    return TextInput::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+#endif
+
 void ComboBox::sendComboBoxEvent()
 {
     wxCommandEvent event(wxEVT_COMBOBOX, GetId());
diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp
index ec35bcb548..a15cd9ae14 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.hpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.hpp
@@ -73,11 +73,16 @@ protected:
     
     void OnEdit() override;
 
+#ifdef __WIN32__
+    WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override;
+#endif
+
 private:
 
     // some useful events
     void mouseDown(wxMouseEvent &event);
     void mouseWheelMoved(wxMouseEvent &event);
+    void keyDown(wxKeyEvent &event);
 
     void sendComboBoxEvent();
 
diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp
index a0cdc6338a..b0b609e46a 100644
--- a/src/slic3r/GUI/Widgets/DropDown.cpp
+++ b/src/slic3r/GUI/Widgets/DropDown.cpp
@@ -71,7 +71,9 @@ void DropDown::SetSelection(int n)
     assert(n < (int) texts.size());
     if (n >= (int) texts.size())
         n = -1;
+    if (selection == n) return;
     selection = n;
+    paintNow();
 }
 
 wxString DropDown::GetValue() const