diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e1326225..7a689fdee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Change Log
 
 ### Improvements
 
+- Enable walking through all the controls in the Find window by the Tab key.
 - Update C++ syntax style to fix highlighting attributes (thanks to Luke McKenzie!).
 - Deprecate the Find Selected Text command.
 - [trivial] Reset custom key bindings for find commands were reset.
diff --git a/CotEditor/Base.lproj/FindPanel.storyboard b/CotEditor/Base.lproj/FindPanel.storyboard
index 1f8056e5b..3c7847ed9 100644
--- a/CotEditor/Base.lproj/FindPanel.storyboard
+++ b/CotEditor/Base.lproj/FindPanel.storyboard
@@ -10,7 +10,7 @@
         <scene sceneID="lwx-CG-VEr">
             <objects>
                 <windowController showSeguePresentationStyle="single" id="2Yd-sK-nho" customClass="FindPanelController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
-                    <window key="window" identifier="findPanel" title="Find &amp; Replace" separatorStyle="line" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="Wal-Sg-6d6" customClass="NSPanel">
+                    <window key="window" identifier="findPanel" title="Find &amp; Replace" separatorStyle="line" allowsToolTipsWhenApplicationIsInactive="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="Wal-Sg-6d6" customClass="NSPanel">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES" utility="YES"/>
                         <rect key="contentRect" x="425" y="461" width="460" height="197"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
@@ -88,7 +88,6 @@
                                                     </dictionary>
                                                 </binding>
                                                 <outlet property="delegate" destination="fdE-8e-ywb" id="v4C-dI-JPd"/>
-                                                <outlet property="nextKeyView" destination="qiQ-tb-XCa" id="cvy-Ew-3PD"/>
                                             </connections>
                                         </textView>
                                     </subviews>
@@ -131,7 +130,6 @@
                                                     </dictionary>
                                                 </binding>
                                                 <outlet property="delegate" destination="fdE-8e-ywb" id="Qg1-pY-DT6"/>
-                                                <outlet property="nextKeyView" destination="hxw-DS-gxQ" id="34Q-n2-dJB"/>
                                             </connections>
                                         </textView>
                                     </subviews>
@@ -206,7 +204,7 @@
                                     <constraint firstAttribute="height" constant="17" id="Bpd-iM-B9o"/>
                                     <constraint firstAttribute="width" constant="34" id="a1V-ce-Ane"/>
                                 </constraints>
-                                <popUpButtonCell key="cell" type="smallSquare" title="DUMMY" bezelStyle="smallSquare" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" inset="2" pullsDown="YES" preferredEdge="maxX" autoenablesItems="NO" altersStateOfSelectedItem="NO" selectedItem="vE8-oK-xlC" id="Jj5-Gl-NDD" userLabel="Recent Searches">
+                                <popUpButtonCell key="cell" type="smallSquare" title="DUMMY" bezelStyle="smallSquare" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" inset="2" pullsDown="YES" preferredEdge="maxX" autoenablesItems="NO" altersStateOfSelectedItem="NO" selectedItem="vE8-oK-xlC" id="Jj5-Gl-NDD" userLabel="Recent Searches">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="menu"/>
                                     <menu key="menu" autoenablesItems="NO" id="hj8-ZE-vCT">
@@ -230,7 +228,7 @@
                             </popUpButton>
                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="Hw7-zz-RG8" userLabel="Recent Replacements">
                                 <rect key="frame" x="14" y="55" width="39" height="17"/>
-                                <popUpButtonCell key="cell" type="smallSquare" title="DUMMY" bezelStyle="smallSquare" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" inset="2" pullsDown="YES" preferredEdge="maxX" autoenablesItems="NO" altersStateOfSelectedItem="NO" id="5v5-WE-Zk4" userLabel="Recent Replacements">
+                                <popUpButtonCell key="cell" type="smallSquare" title="DUMMY" bezelStyle="smallSquare" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" inset="2" pullsDown="YES" preferredEdge="maxX" autoenablesItems="NO" altersStateOfSelectedItem="NO" id="5v5-WE-Zk4" userLabel="Recent Replacements">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="menu"/>
                                     <menu key="menu" autoenablesItems="NO" id="vPb-fy-Hh6">
@@ -274,7 +272,7 @@
                                     <constraint firstAttribute="height" constant="14" id="9ek-RA-xWp"/>
                                     <constraint firstAttribute="width" secondItem="ObJ-nS-x0g" secondAttribute="height" multiplier="1:1" id="T9W-SF-Lok"/>
                                 </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="jxx-at-moE">
+                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" id="jxx-at-moE">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -290,7 +288,7 @@
                                     <constraint firstAttribute="width" secondItem="Y5M-CG-n0V" secondAttribute="height" multiplier="1:1" id="YC9-gF-7eS"/>
                                     <constraint firstAttribute="height" constant="14" id="e2p-u6-YCM"/>
                                 </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="zCK-87-9kX">
+                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" id="zCK-87-9kX">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
diff --git a/CotEditor/Sources/FindPanelController.swift b/CotEditor/Sources/FindPanelController.swift
index bed7671d5..a4a1977d4 100644
--- a/CotEditor/Sources/FindPanelController.swift
+++ b/CotEditor/Sources/FindPanelController.swift
@@ -47,7 +47,7 @@ final class FindPanelController: NSWindowController {
         
         // select text in find text field
         if self.window?.firstResponder == self.window?.initialFirstResponder {
-            // force reset firstResponder to invoke becomeFirstResponder in FindPanelTextView every time
+            // forcibly reset firstResponder to invoke becomeFirstResponder in FindPanelTextView every time
             // -> `becomeFirstResponder` will not be called on `makeFirstResponder:` if it given object is already set as first responder.
             self.window?.makeFirstResponder(nil)
         }
diff --git a/CotEditor/Sources/FindPanelTextView.swift b/CotEditor/Sources/FindPanelTextView.swift
index 91aea36f3..c4c6c7efa 100644
--- a/CotEditor/Sources/FindPanelTextView.swift
+++ b/CotEditor/Sources/FindPanelTextView.swift
@@ -119,27 +119,27 @@ class FindPanelTextView: NSTextView {
     }
     
     
-    /// jump to the next responder with tab key (standard NSTextField behavior)
+    /// jump to the next key view by the Tab key (standard NSTextField behavior)
     override func insertTab(_ sender: Any?) {
         
-        self.window?.makeFirstResponder(self.nextKeyView)
+        self.window?.selectNextKeyView(nil)
     }
     
     
-    /// jump to the previous responder with tab key (standard NSTextField behavior)
+    /// jump to the previous key view by the Tab key (standard NSTextField behavior)
     override func insertBacktab(_ sender: Any?) {
         
-        self.window?.makeFirstResponder(self.previousKeyView)
+        self.window?.selectPreviousKeyView(nil)
     }
     
     
-    /// swap '¥' with '\' if needed
+    /// swap `¥` with `\` if needed
     override func insertText(_ string: Any, replacementRange: NSRange) {
         
         // cast input to String
         var string = String(anyString: string)
         
-        // swap '¥' with '\' if needed
+        // swap `¥` with `\` if needed
         if UserDefaults.standard[.swapYenAndBackSlash] {
             switch string {
                 case "\\":
@@ -156,7 +156,7 @@ class FindPanelTextView: NSTextView {
     
     override func responds(to aSelector: Selector!) -> Bool {
         
-        // ignore text find action
+        // ignore text find action (standard NSTextField behavior)
         if aSelector == #selector(performTextFinderAction) {
             return false
         }