diff --git a/CHANGELOG.md b/CHANGELOG.md
index af1dedf94..b3a8bb9bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ develop
 - Restore the last viewed preference pane when Preferences is opened.
 - Add an input field for window opacity setting.
 - Adjust scroll after toggling line wrap.
+- Add scroll margin to the right side of find panel fields dynamically, so that entire inputs can be seen even when find/replacement result is shown.
 - Update Python syntax style:
     - Fix highlight of string and bytes literals.
 - Tweak acknowledgments window design.
diff --git a/CotEditor/Base.lproj/FindPanel.storyboard b/CotEditor/Base.lproj/FindPanel.storyboard
index 91e6342ba..e8a7717c6 100644
--- a/CotEditor/Base.lproj/FindPanel.storyboard
+++ b/CotEditor/Base.lproj/FindPanel.storyboard
@@ -97,11 +97,12 @@
                                         </textView>
                                     </subviews>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/>
                                 </clipView>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="9IF-SN-YIL"/>
                                 </constraints>
-                                <scroller key="horizontalScroller" verticalHuggingPriority="750" doubleValue="1" controlSize="small" horizontal="YES" id="JOy-bP-bNy">
+                                <scroller key="horizontalScroller" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="JOy-bP-bNy">
                                     <rect key="frame" x="1" y="29" width="418" height="14"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -138,6 +139,7 @@
                                         </textView>
                                     </subviews>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/>
                                 </clipView>
                                 <scroller key="horizontalScroller" verticalHuggingPriority="750" doubleValue="1" controlSize="small" horizontal="YES" id="pGV-vQ-vMo">
                                     <rect key="frame" x="1" y="29" width="418" height="14"/>
@@ -247,37 +249,21 @@
                                     </menu>
                                 </popUpButtonCell>
                             </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kkq-6q-C63">
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kkq-6q-C63">
                                 <rect key="frame" x="358" y="107" width="59" height="14"/>
                                 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Not Found" drawsBackground="YES" usesSingleLineMode="YES" id="Ghf-cy-qgo">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
-                                <connections>
-                                    <binding destination="fdE-8e-ywb" name="value" keyPath="findResultMessage" id="XCX-xt-29G"/>
-                                    <binding destination="fdE-8e-ywb" name="hidden" keyPath="findResultMessage" id="sQe-Kg-hZn">
-                                        <dictionary key="options">
-                                            <string key="NSValueTransformerName">NSIsNil</string>
-                                        </dictionary>
-                                    </binding>
-                                </connections>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SSP-y6-YxI">
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SSP-y6-YxI">
                                 <rect key="frame" x="342" y="53" width="75" height="14"/>
                                 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Not Replaced" drawsBackground="YES" usesSingleLineMode="YES" id="2sg-74-GwO">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
-                                <connections>
-                                    <binding destination="fdE-8e-ywb" name="hidden" keyPath="replacementResultMessage" id="0Q0-eY-eqr">
-                                        <dictionary key="options">
-                                            <string key="NSValueTransformerName">NSIsNil</string>
-                                        </dictionary>
-                                    </binding>
-                                    <binding destination="fdE-8e-ywb" name="value" keyPath="replacementResultMessage" id="49Q-UT-T2z"/>
-                                </connections>
                             </textField>
                             <button translatesAutoresizingMaskIntoConstraints="NO" id="ObJ-nS-x0g">
                                 <rect key="frame" x="421" y="107" width="14" height="14"/>
@@ -349,8 +335,10 @@
                     </view>
                     <connections>
                         <outlet property="findHistoryMenu" destination="hj8-ZE-vCT" id="c5A-gt-012"/>
+                        <outlet property="findResultField" destination="Kkq-6q-C63" id="egT-XH-XQa"/>
                         <outlet property="findTextView" destination="hxw-DS-gxQ" id="4Nw-RH-bWa"/>
                         <outlet property="replaceHistoryMenu" destination="vPb-fy-Hh6" id="TQo-Ah-NfI"/>
+                        <outlet property="replacementResultField" destination="SSP-y6-YxI" id="UEW-Qa-UwC"/>
                         <outlet property="replacementTextView" destination="qiQ-tb-XCa" id="TeX-xf-XXK"/>
                     </connections>
                 </viewController>
@@ -622,7 +610,7 @@
         <image name="NSActionTemplate" width="14" height="14"/>
         <image name="NSGoLeftTemplate" width="9" height="12"/>
         <image name="NSGoRightTemplate" width="9" height="12"/>
-        <image name="NSStopProgressFreestandingTemplate" width="11" height="11"/>
+        <image name="NSStopProgressFreestandingTemplate" width="14" height="14"/>
         <image name="ReplaceTemplate" width="20" height="13"/>
     </resources>
 </document>
diff --git a/CotEditor/Sources/FindPanelFieldViewController.swift b/CotEditor/Sources/FindPanelFieldViewController.swift
index 82a0b9b01..bcdae5321 100644
--- a/CotEditor/Sources/FindPanelFieldViewController.swift
+++ b/CotEditor/Sources/FindPanelFieldViewController.swift
@@ -33,8 +33,6 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
     
     @objc private dynamic let textFinder = TextFinder.shared
     
-    @objc private dynamic var findResultMessage: String?  // binding
-    @objc private dynamic var replacementResultMessage: String?  // binding
     private weak var currentResultMessageTarget: NSLayoutManager?  // grab layoutManager instead of NSTextView to use weak reference
     
     private lazy var regexReferenceViewController = DetachablePopoverViewController(nibName: NSNib.Name("RegexReferenceView"), bundle: nil)
@@ -44,6 +42,8 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
     @IBOutlet private var replacementTextView: NSTextView?  // NSTextView cannot be weak
     @IBOutlet private weak var findHistoryMenu: NSMenu?
     @IBOutlet private weak var replaceHistoryMenu: NSMenu?
+    @IBOutlet private weak var findResultField: NSTextField?
+    @IBOutlet private weak var replacementResultField: NSTextField?
     
     
     
@@ -194,10 +194,13 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
         
         self.clearNumberOfFound()
         
-        self.findResultMessage = {
+        guard let field = self.findResultField else { return }
+        
+        field.isHidden = false
+        field.stringValue = {
             switch numberOfFound {
             case -1:
-                return nil
+                return ""
             case 0:
                 return NSLocalizedString("Not Found", comment: "")
             default:
@@ -206,6 +209,9 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
             }
         }()
         
+        self.findTextView?.enclosingScrollView?.contentView.contentInsets.right = field.frame.width
+        moof(field.frame.width)
+        
         // dismiss result either client text or find string did change
         self.currentResultMessageTarget = target.layoutManager
         NotificationCenter.default.addObserver(self, selector: #selector(clearNumberOfFound), name: NSTextStorage.didProcessEditingNotification, object: target.textStorage)
@@ -218,10 +224,13 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
         
         self.clearNumberOfReplaced()
         
-        self.replacementResultMessage = {
+        guard let field = self.replacementResultField else { return }
+        
+        field.isHidden = false
+        field.stringValue = {
             switch numberOfReplaced {
             case -1:
-                return nil
+                return ""
             case 0:
                 return NSLocalizedString("Not Replaced", comment: "")
             default:
@@ -229,6 +238,8 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
                               String.localizedStringWithFormat("%li", numberOfReplaced))
             }
         }()
+        
+        self.replacementTextView?.enclosingScrollView?.contentView.contentInsets.right = field.frame.width
     }
 
     
@@ -275,7 +286,9 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
     /// number of found in find string field becomes no more valid
     @objc private func clearNumberOfFound(_ notification: Notification? = nil) {
         
-        self.findResultMessage = nil
+        self.replacementResultField?.isHidden = true
+        self.findResultField?.stringValue = ""
+        self.findTextView?.enclosingScrollView?.contentView.contentInsets.right = 0
         
         // -> specify the object to remove osberver to avoid removing the windowWillClose notification (via delegate) from find panel itself.
         if let target = self.currentResultMessageTarget?.firstTextView {
@@ -288,7 +301,9 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
     /// number of replaced in replacement string field becomes no more valid
     @objc private func clearNumberOfReplaced(_ notification: Notification? = nil) {
         
-        self.replacementResultMessage = nil
+        self.replacementResultField?.isHidden = true
+        self.replacementResultField?.stringValue = ""
+        self.replacementTextView?.enclosingScrollView?.contentView.contentInsets.right = 0
     }
     
 }