diff --git a/app/views/organisations/logs.html.erb b/app/views/organisations/logs.html.erb
index a12287530..bf4e76498 100644
--- a/app/views/organisations/logs.html.erb
+++ b/app/views/organisations/logs.html.erb
@@ -11,10 +11,10 @@
 
 <div class="app-filter-layout" data-controller="filter-layout">
   <%= render partial: "case_logs/log_filters" %>
-  <% if @case_logs.present? %>
-    <div class="app-filter-layout__content">
-      <%= render partial: "case_logs/log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy } %>
-      <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
-    </div>
-  <% end %>
+  <div class="app-filter-layout__content">
+    <%= render SearchComponent.new(current_user:, search_label: "Search by log ID, tenant code, property reference or postcode", value: @searched) %>
+    <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
+    <%= render partial: "case_logs/log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy } %>
+    <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
+  </div>
 </div>
diff --git a/spec/features/organisation_spec.rb b/spec/features/organisation_spec.rb
index 75277a28a..c5725d541 100644
--- a/spec/features/organisation_spec.rb
+++ b/spec/features/organisation_spec.rb
@@ -84,12 +84,13 @@ RSpec.describe "User Features" do
   context "when user is support user" do
     context "when viewing logs for specific organisation" do
       let(:user) { FactoryBot.create(:user, :support) }
-      let(:number_of_case_logs) { 4 }
       let(:first_log) { organisation.case_logs.first }
       let(:otp) { "999111" }
+      let!(:log_to_search) { FactoryBot.create(:case_log, owning_organisation: user.organisation, managing_organisation_id: organisation.id) }
+      let!(:other_logs) { FactoryBot.create_list(:case_log, 4, owning_organisation_id: organisation.id, managing_organisation_id: organisation.id) }
+      let(:number_of_case_logs) { CaseLog.count }
 
       before do
-        FactoryBot.create_list(:case_log, number_of_case_logs, owning_organisation_id: organisation.id, managing_organisation_id: organisation.id)
         first_log.update!(startdate: Time.utc(2022, 6, 2, 10, 36, 49))
         allow(SecureRandom).to receive(:random_number).and_return(otp)
         click_link("Sign out")
@@ -99,6 +100,48 @@ RSpec.describe "User Features" do
         visit("/organisations/#{org_id}/logs")
       end
 
+      context "when searching for specific logs" do
+        it "displays the logs belonging to the same organisation" do
+          expect(page).to have_content(log_to_search.id)
+          other_logs.each do |log|
+            expect(page).to have_content(log.id)
+          end
+        end
+
+        context "when I search for a specific log" do
+          it "there is a search bar with a message and search button for logs" do
+            expect(page).to have_field("search")
+            expect(page).to have_content("Search by log ID, tenant code, property reference or postcode")
+            expect(page).to have_button("Search")
+          end
+
+          context "when I fill in search information and press the search button" do
+            before do
+              fill_in("search", with: log_to_search.id)
+              click_button("Search")
+            end
+
+            it "displays log matching the log ID" do
+              expect(page).to have_content(log_to_search.id)
+              other_logs.each do |log|
+                expect(page).not_to have_content(log.id)
+              end
+            end
+
+            context "when I want to clear results" do
+              it "there is link to clear the search results" do
+                expect(page).to have_link("Clear search")
+              end
+
+              it "displays the logs belonging to the same organisation after I clear the search result after I clear the search resultss" do
+                click_link("Clear search")
+                expect(page).to have_content(log_to_search.id)
+              end
+            end
+          end
+        end
+      end
+
       it "can filter case logs" do
         expect(page).to have_content("#{number_of_case_logs} total logs")
         organisation.case_logs.map(&:id).each do |case_log_id|