diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt
index e0c5c12f2dbe..86daac7fa4c4 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt
@@ -343,7 +343,11 @@ object Switcher : BaseSwitcherAction(null) {
       }
       isFocusCycleRoot = true
       if (ScreenReader.isActive()) {
-        focusTraversalPolicy = ListFocusTraversalPolicy(listOf(files, toolWindows, cbShowOnlyEditedFiles))
+        val list = mutableListOf<Component>(files, toolWindows)
+        if (cbShowOnlyEditedFiles != null) {
+          list.add(cbShowOnlyEditedFiles)
+        }
+        focusTraversalPolicy = ListFocusTraversalPolicy(list)
       }
       else {
         focusTraversalPolicy = LayoutFocusTraversalPolicy()