diff --git a/Frameworks/DocumentWindow/src/DocumentWindowController.mm b/Frameworks/DocumentWindow/src/DocumentWindowController.mm
index a7e4e744..54758adc 100644
--- a/Frameworks/DocumentWindow/src/DocumentWindowController.mm
+++ b/Frameworks/DocumentWindow/src/DocumentWindowController.mm
@@ -216,7 +216,6 @@ static NSArray* const kObservedKeyPaths = @[ @"arrayController.arrangedObjects.p
 		[LicenseManager.sharedInstance decorateWindow:self.window];
 
 		OakAddAutoLayoutViewsToSuperview(@[ self.layoutView ], self.window.contentView);
-		OakSetupKeyViewLoop(@[ self.layoutView ]);
 		self.window.initialFirstResponder = self.textView;
 
 		[self.window.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[view]|" options:0 metrics:nil views:@{ @"view": self.layoutView }]];
diff --git a/Frameworks/OakFilterList/src/SymbolChooser.mm b/Frameworks/OakFilterList/src/SymbolChooser.mm
index f19095ab..e621403a 100644
--- a/Frameworks/OakFilterList/src/SymbolChooser.mm
+++ b/Frameworks/OakFilterList/src/SymbolChooser.mm
@@ -67,7 +67,6 @@ static SymbolChooserItem* CreateItem (OakDocument* document, text::pos_t const&
 
 		[self updateScrollViewInsets];
 
-		OakSetupKeyViewLoop(@[ self.searchField ]);
 		self.window.initialFirstResponder = self.searchField;
 	}
 	return self;