diff --git a/src/plugins/coreplugin/find/currentdocumentfind.cpp b/src/plugins/coreplugin/find/currentdocumentfind.cpp
index 7cbe94783f6..7fe84aac158 100644
--- a/src/plugins/coreplugin/find/currentdocumentfind.cpp
+++ b/src/plugins/coreplugin/find/currentdocumentfind.cpp
@@ -165,8 +165,12 @@ void CurrentDocumentFind::updateCandidateFindFilter(QWidget *old, QWidget *now)
         if (!impl)
             candidate = candidate->parentWidget();
     }
-    if (candidate == m_candidateWidget && impl == m_candidateFind)
+    if (candidate == m_candidateWidget && impl == m_candidateFind) {
+        // trigger update of action state since a changed focus can still require disabling the
+        // Find/Replace action
+        emit changed();
         return;
+    }
     if (m_candidateWidget)
         disconnect(Aggregation::Aggregate::parentAggregate(m_candidateWidget), &Aggregation::Aggregate::changed,
                    this, &CurrentDocumentFind::candidateAggregationChanged);