diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index a19bed05a8..334643a201 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -4277,7 +4277,10 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) p = p->GetParent(); auto *top_level_wnd = dynamic_cast(p); //Orca: Set focus so hotkeys like 'tab' work when a notification is shown. - if (top_level_wnd != nullptr && top_level_wnd->IsActive()) + //But don't steal focus from text input controls. + wxWindow* focused = wxWindow::FindFocus(); + bool focus_in_text_ctrl = dynamic_cast(focused) != nullptr; + if (top_level_wnd != nullptr && top_level_wnd->IsActive() && !focus_in_text_ctrl) m_canvas->SetFocus(); } m_mouse.position = pos.cast();