@@ -360,7 +360,10 @@ private void FindTextBoxKeyPress(Object sender, KeyPressEventArgs e)
             if (e.KeyChar == (Char)Keys.Return && this.findTextBox.Text.Trim() != "")
             {
                 e.Handled = true;
-                this.FindNext(this.findTextBox.Text, false);
+                if ((ModifierKeys & Keys.Shift) == Keys.Shift)
+                    FindPrev(findTextBox.Text, false);
+                else
+                    FindNext(findTextBox.Text, false);
             }
         }
 
 
@@ -624,6 +624,18 @@ private void DialogLoad(Object sender, EventArgs e)
             this.CenterToParent();
         }
 
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if ((keyData & (Keys.Enter | Keys.Shift)) > 0)
+            {
+                FindNext(false, false);
+
+                return true;
+            }
+
+            return base.ProcessDialogKey(keyData);
+        }
+
         /// <summary>
         /// Gets the replacement text and escapes it if needed
         /// </summary>
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,10 @@ private void FindTextBoxKeyPress(Object sender, KeyPressEventArgs e)`
`360`	`360`	`if (e.KeyChar == (Char)Keys.Return && this.findTextBox.Text.Trim() != "")`
`361`	`361`	`{`
`362`	`362`	`e.Handled = true;`
`363`		`- this.FindNext(this.findTextBox.Text, false);`
	`363`	`+ if ((ModifierKeys & Keys.Shift) == Keys.Shift)`
	`364`	`+ FindPrev(findTextBox.Text, false);`
	`365`	`+ else`
	`366`	`+ FindNext(findTextBox.Text, false);`
`364`	`367`	`}`
`365`	`368`	`}`
`366`	`369`