diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 49a882a7..394c9e5a 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -1816,9 +1816,11 @@ public class Application.MainWindow :
         bool sensitive = (count != NONE);
         bool multiple = (count == MULTIPLE);
 
-        get_window_action(ACTION_FIND_IN_CONVERSATION).set_enabled(
+        bool find_in_enabled = (
             sensitive && !multiple && this.is_conversation_viewer_shown
         );
+        get_window_action(ACTION_FIND_IN_CONVERSATION).set_enabled(find_in_enabled);
+        this.conversation_headerbar.set_find_sensitive(find_in_enabled);
 
         bool reply_sensitive = (
             sensitive &&
diff --git a/src/client/components/components-headerbar-conversation.vala b/src/client/components/components-headerbar-conversation.vala
index 6179f031..609984e4 100644
--- a/src/client/components/components-headerbar-conversation.vala
+++ b/src/client/components/components-headerbar-conversation.vala
@@ -56,4 +56,8 @@ public class Components.ConversationHeaderBar : Gtk.Bin {
         remove(header);
         add(this.conversation_header);
     }
+
+    public void set_find_sensitive(bool is_sensitive) {
+        this.find_button.sensitive = is_sensitive;
+    }
 }