diff --git a/lib/images/dialog-toggle_findreplaceadv.png b/lib/images/dialog-toggle_findreplaceadv.png
new file mode 100644
index 0000000000..aea99c092a
Binary files /dev/null and b/lib/images/dialog-toggle_findreplaceadv.png differ
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index d98302f09a..7caf02ae80 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -104,7 +104,7 @@ Menuset
 		Item "Select All" "command-sequence buffer-begin ; buffer-end-select"
 		Separator
 		Item "Find & Replace (Quick)...|F" "dialog-show findreplace"
-		Item "Find & Replace (Advanced)..." "dialog-toggle findreplaceadv"
+		Item "Find & Replace (Advanced)..." "dialog-show findreplaceadv"
 		Separator
 		Item "Move Paragraph Up|o" "paragraph-move-up"
 		Item "Move Paragraph Down|v" "paragraph-move-down"
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 4fc4d34d16..5f419edb15 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -79,6 +79,7 @@ ToolbarSet
 		Item "Copy" "copy"
 		Item "Paste" "paste"
 		Item "Find and replace" "dialog-show findreplace"
+		Item "Find and replace (advanced)" "dialog-toggle findreplaceadv"
 		Item "Navigate back" "bookmark-goto 0"
 		Separator
 		Item "Toggle emphasis" "font-emph"