diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp
index f970a6a964..0e534465ae 100644
--- a/src/slic3r/GUI/Widgets/SpinInput.cpp
+++ b/src/slic3r/GUI/Widgets/SpinInput.cpp
@@ -239,7 +239,7 @@ Button *SpinInput::createButton(bool inc)
 {
     auto btn = new Button(this, "", inc ? "spin_inc" : "spin_dec", wxBORDER_NONE, 6);
     btn->SetCornerRadius(0);
-    btn->SetCanFocus(false);
+    btn->DisableFocusFromKeyboard();
     btn->Bind(wxEVT_LEFT_DOWN, [=](auto &e) {
         delta = inc ? 1 : -1;
         SetValue(val + delta);
diff --git a/src/slic3r/GUI/Widgets/StaticLine.cpp b/src/slic3r/GUI/Widgets/StaticLine.cpp
index 69892ebcbd..16f89ec9ce 100644
--- a/src/slic3r/GUI/Widgets/StaticLine.cpp
+++ b/src/slic3r/GUI/Widgets/StaticLine.cpp
@@ -16,6 +16,7 @@ StaticLine::StaticLine(wxWindow* parent, bool vertical, const wxString& label)
 {
     wxWindow::SetBackgroundColour(parent->GetBackgroundColour());
     this->pen = wxPen(wxColour("#C4C4C4"));
+    DisableFocusFromKeyboard();
     SetFont(Label::Body_14);
     SetLabel(label);
 }