diff --git a/src/xrGame/ui/UISecondTaskWnd.cpp b/src/xrGame/ui/UISecondTaskWnd.cpp index 2618cc2ff64..d116456d63c 100644 --- a/src/xrGame/ui/UISecondTaskWnd.cpp +++ b/src/xrGame/ui/UISecondTaskWnd.cpp @@ -95,15 +95,18 @@ void UITaskListWnd::Show(bool status) GetMessageTarget()->SetKeyboardCapture(this, true); focus.LockToWindow(this); - if (m_list->Empty()) + if (pInput->IsCurrentInputTypeController()) { - focus.SetFocused(nullptr); - UI().GetUICursor().WarpToWindow(m_list, true); - } - else - { - const auto item = static_cast(m_list->Items()[0]); - item->Focus(); + if (m_list->Empty()) + { + focus.SetFocused(nullptr); + UI().GetUICursor().WarpToWindow(m_list, true); + } + else + { + const auto item = static_cast(m_list->Items()[0]); + item->Focus(); + } } } else diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp index 090e54388e8..923a8deba0a 100644 --- a/src/xrGame/ui/UITalkWnd.cpp +++ b/src/xrGame/ui/UITalkWnd.cpp @@ -140,7 +140,8 @@ void CUITalkWnd::UpdateQuestions() } } - UITalkDialogWnd->FocusOnFirstQuestion(); + if (pInput->IsCurrentInputTypeController()) + UITalkDialogWnd->FocusOnFirstQuestion(); m_bNeedToUpdateQuestions = false; }