Skip to content

Cherry-pick "Fix File Explorer search box losing focus after Ctrl+F (#20022)" to rc #20138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanbudd merged 4 commits into from
May 15, 2026
Merged

Cherry-pick "Fix File Explorer search box losing focus after Ctrl+F (#20022)" to rc #20138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f53489
Fix File Explorer search box losing focus after Ctrl+F (#20022)
cary-rowen May 8, 2026
fe363f2
Apply suggestion from @seanbudd
seanbudd May 15, 2026
7101925
Merge branch 'rc' into 20022-to-rc
seanbudd May 15, 2026
d1168fb
Merge branch 'rc' into 20022-to-rc
seanbudd May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions source/appModules/explorer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ def _get_container(self):
return super(MultitaskingViewFrameListItem, self).container


class SearchBoxClient(IAccessible):
# #20021: File Explorer can fire a redundant MSAA focus event on the search band pane
# immediately after the UIA SearchEditBox gains focus.
shouldAllowIAccessibleFocusEvent = False


# Class for menu items for Windows Places and Frequently used Programs (in start menu)
# Also used for desktop items
class SysListView32EmittingDuplicateFocusEvents(IAccessible):
Expand Down Expand Up @@ -213,6 +219,14 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList): # NOQA: C901
windowClass = obj.windowClassName
role = obj.role

if (
windowClass in ("Search Box", "UniversalSearchBand")
and role == controlTypes.Role.PANE
and isinstance(obj, IAccessible)
):
clsList.insert(0, SearchBoxClient)
return # Optimization: return early to avoid comparing class names and roles that will never match.

if windowClass == "ToolbarWindow32":
if role != controlTypes.Role.POPUPMENU:
try:
Expand Down
5 changes: 5 additions & 0 deletions user_docs/en/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 2026.1.1

This is a patch release to fix a security issue.
A bug fix is also included for an issue introduced in 2026.1 with how `ctrl+f` is handled in File Explorer.
A change introduced in 2026.1 with how NVDA handles connection issues with Remote Access was removed.

### Security fixes
Expand All @@ -12,6 +13,10 @@ Please responsibly disclose security issues following NVDA's [security policy](h
* Fixed an issue which could cause NVDA to connect to an untrusted Remote Access server. ([GHSA-m268-mc77-j2cr](https://github.com/nvaccess/nvda/security/advisories/GHSA-m268-mc77-j2cr))
* Prevents a situation which could cause unselected add-ons to be copied to the system-wide configuration. ([GHSA-669f-7gpr-5vqm](https://github.com/nvaccess/nvda/security/advisories/GHSA-669f-7gpr-5vqm))

### Bug Fixes

* In File Explorer, pressing `ctrl+f` once again focuses the search box without subsequently reporting a pane. (#20021, @Cary-rowen)

### Changes

* Remote Access once again attempts automatic reconnection after a failed initial connection as the controlled computer, rather than failing immediately.
Expand Down
Loading