diff --git a/MVMCoreUI/Accessibility/RotorHandler.swift b/MVMCoreUI/Accessibility/RotorHandler.swift
index d529564b..a4546980 100644
--- a/MVMCoreUI/Accessibility/RotorHandler.swift
+++ b/MVMCoreUI/Accessibility/RotorHandler.swift
@@ -24,8 +24,6 @@ fileprivate enum RotorType: String, CaseIterable {
             return .header
         case .link:
             return .link
-        default:
-            return .none
         }
     }
     
@@ -41,7 +39,7 @@ fileprivate enum RotorType: String, CaseIterable {
     var filter: ((UIView) -> Bool) {
         switch self {
         default:
-            return { $0.accessibilityTraits.contains(trait) }
+            return { $0.accessibilityTraits.contains(trait) && !$0.isHidden }
         }
     }