diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItem.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItem.java
index 864b828a9da..e35a3509ccc 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItem.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItem.java
@@ -18,6 +18,9 @@
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 
+import org.eclipse.core.commands.HandlerEvent;
+import org.eclipse.core.commands.IHandlerListener;
+
 import org.eclipse.jface.layout.GridDataFactory;
 
 class AccessibleToolItem {
@@ -25,7 +28,6 @@ class AccessibleToolItem {
 
 	private String baseToolTipText;
 
-
 	AccessibleToolItem(Composite parent, int styleBits) {
 		ToolBar toolbar = new ToolBar(parent, SWT.FLAT | SWT.HORIZONTAL);
 		GridDataFactory.fillDefaults().grab(true, true).align(SWT.CENTER, SWT.CENTER).applyTo(toolbar);
@@ -51,6 +53,15 @@ void setToolTipText(String text) {
 
 	void setAction(FindReplaceOverlayAction action) {
 		setToolTipText(toolItem.getToolTipText());
+		toolItem.setEnabled(action.isEnabled());
+		action.addHandlerListener(new IHandlerListener() {
+			@Override
+			public void handlerChanged(HandlerEvent event) {
+				if (event.isEnabledChanged() && !toolItem.isDisposed()) {
+					toolItem.setEnabled(action.isEnabled());
+				}
+			}
+		});
 		toolItem.addSelectionListener(SelectionListener.widgetSelectedAdapter(__ -> action.execute()));
 		action.addShortcutHintListener(hint -> {
 			if (!toolItem.isDisposed()) {
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java
index 186fe5eb7c0..bb1cadd4a68 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolItemBuilder.java
@@ -104,12 +104,8 @@ public ToolItem build() {
 					toolItem.setSelection(invertSearchOption ? !state : state);
 				}
 			});
-			toolItem.setEnabled(findReplaceLogic.isAvailable(searchOption));
-			findReplaceLogic.addSearchOptionAvailabilityChangedListener(searchOption, state -> {
-				if (!toolItem.isDisposed()) {
-					toolItem.setEnabled(state);
-				}
-			});
+			searchOptionAction.setAvailable(findReplaceLogic.isAvailable(searchOption));
+			findReplaceLogic.addSearchOptionAvailabilityChangedListener(searchOption, searchOptionAction::setAvailable);
 			return toolItem;
 		}
 	}
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayAction.java
index 9440853f829..25d9b74d045 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayAction.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayAction.java
@@ -15,9 +15,12 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+
 import org.eclipse.jface.bindings.keys.KeyStroke;
 
-class FindReplaceOverlayAction {
+class FindReplaceOverlayAction extends AbstractHandler {
 	private final Runnable operation;
 
 	private final List<Runnable> executionListeners = new ArrayList<>();
@@ -34,11 +37,21 @@ void addShortcuts(List<KeyStroke> shortcutsToAdd) {
 		this.shortcuts.addAll(shortcutsToAdd);
 	}
 
+	@Override
+	public Object execute(ExecutionEvent event) {
+		execute();
+		return null;
+	}
+
 	void execute() {
 		operation.run();
 		notifyExecutionListeners();
 	}
 
+	void setAvailable(boolean available) {
+		setBaseEnabled(available);
+	}
+
 	List<KeyStroke> getShortcuts() {
 		return Collections.unmodifiableList(shortcuts);
 	}