diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index 05c2d559c..8d1b5027a 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -447,6 +447,11 @@ std::string noSuchBookErrorMsg(const std::string& bookName)
   return "No such book: " + bookName;
 }
 
+std::string noSearchResultsMsg()
+{
+  return "The fulltext search engine is not available for this content.";
+}
+
 } // unnamed namespace
 
 std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& request)
@@ -591,12 +596,12 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
     } catch(std::runtime_error& e) {
       // Searcher->search will throw a runtime error if there is no valid xapian database to do the search.
       // (in case of zim file not containing a index)
-      auto data = get_default_data();
-      data.set("pattern", encodeDiples(searchInfo.pattern));
-      auto response = ContentResponse::build(*this, RESOURCE::templates::no_search_result_html, data, "text/html; charset=utf-8");
-      response->set_code(MHD_HTTP_NOT_FOUND);
-      response->set_taskbar(searchInfo.bookName, archive.get());
-      return std::move(response);
+      return HTTPErrorHtmlResponse(*this, request, MHD_HTTP_NOT_FOUND,
+                                   "Fulltext search unavailable",
+                                   "Not Found",
+                                   m_root + "/skin/search_results.css")
+           + noSearchResultsMsg()
+           + TaskbarInfo(searchInfo.bookName, archive.get());
     }
 
 
diff --git a/src/server/response.cpp b/src/server/response.cpp
index aefa0dc71..f87ffecb5 100644
--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -101,7 +101,8 @@ HTTPErrorHtmlResponse::HTTPErrorHtmlResponse(const InternalServer& server,
                                              const RequestContext& request,
                                              int httpStatusCode,
                                              const std::string& pageTitleMsg,
-                                             const std::string& headingMsg)
+                                             const std::string& headingMsg,
+                                             const std::string& cssUrl)
   : ContentResponseBlueprint(&server,
                              &request,
                              httpStatusCode,
@@ -110,6 +111,7 @@ HTTPErrorHtmlResponse::HTTPErrorHtmlResponse(const InternalServer& server,
 {
   kainjow::mustache::list emptyList;
   this->m_data = kainjow::mustache::object{
+                    {"CSS_URL", onlyAsNonEmptyMustacheValue(cssUrl) },
                     {"PAGE_TITLE",   pageTitleMsg},
                     {"PAGE_HEADING", headingMsg},
                     {"details", emptyList}
diff --git a/src/server/response.h b/src/server/response.h
index 710e2bc0f..1c93434e3 100644
--- a/src/server/response.h
+++ b/src/server/response.h
@@ -184,7 +184,8 @@ struct HTTPErrorHtmlResponse : ContentResponseBlueprint
                       const RequestContext& request,
                       int httpStatusCode,
                       const std::string& pageTitleMsg,
-                      const std::string& headingMsg);
+                      const std::string& headingMsg,
+                      const std::string& cssUrl = "");
 
   using ContentResponseBlueprint::operator+;
   HTTPErrorHtmlResponse& operator+(const std::string& msg);
diff --git a/static/resources_list.txt b/static/resources_list.txt
index 7444c48ae..15275ad19 100644
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -34,7 +34,6 @@ skin/fonts/Roboto.ttf
 skin/block_external.js
 skin/search_results.css
 templates/search_result.html
-templates/no_search_result.html
 templates/error.html
 templates/index.html
 templates/suggestion.json
diff --git a/static/skin/search_results.css b/static/skin/search_results.css
index 8fb0a84b1..9fc107e9c 100644
--- a/static/skin/search_results.css
+++ b/static/skin/search_results.css
@@ -18,7 +18,7 @@ a:hover {
 text-decoration: underline
 }
 
-.header {
+h1 {
 font-size: 120%;
 }
 
diff --git a/static/templates/error.html b/static/templates/error.html
index 5fcc0ff2c..711082096 100644
--- a/static/templates/error.html
+++ b/static/templates/error.html
@@ -3,6 +3,9 @@
   <head>
     <meta content="text/html;charset=UTF-8" http-equiv="content-type" />
     <title>{{PAGE_TITLE}}</title>
+{{#CSS_URL}}
+    <link type="text/css" href="{{{CSS_URL}}}" rel="Stylesheet" />
+{{/CSS_URL}}
   </head>
   <body>
     <h1>{{PAGE_HEADING}}</h1>
diff --git a/static/templates/no_search_result.html b/static/templates/no_search_result.html
deleted file mode 100644
index baa7aa2c7..000000000
--- a/static/templates/no_search_result.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta content="text/html;charset=UTF-8" http-equiv="content-type" />
-    <title>Fulltext search unavailable</title>
-    <link type="text/css" href="{{root}}/skin/search_results.css" rel="Stylesheet" />
-  </head>
-  <body>
-    <div class="header">Not found</div>
-    <p>
-      There is no article with the title <b> "{{pattern}}"</b>
-      and the fulltext search engine is not available for this content.
-    </p>
-  </body>
-</html>
diff --git a/test/server.cpp b/test/server.cpp
index 6467d44fa..d4056dda0 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -430,7 +430,8 @@ std::string TestContentIn404HtmlResponse::expectedResponse() const
     R"FRAG(</title>
 )FRAG",
 
-    R"FRAG(  <link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
+    R"FRAG(
+  <link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
 <link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
 <link type="text/css" href="/ROOT/skin/taskbar.css" rel="Stylesheet" />
 <script type="text/javascript" src="/ROOT/skin/jquery-ui/external/jquery/jquery.js" defer></script>
@@ -497,8 +498,7 @@ std::string TestContentIn404HtmlResponse::pageCssLink() const
 
   return R"(    <link type="text/css" href=")"
        + expectedCssUrl
-       + R"(" rel="Stylesheet" />
-)";
+       + R"(" rel="Stylesheet" />)";
 }
 
 std::string TestContentIn404HtmlResponse::hiddenBookNameInput() const
@@ -686,6 +686,18 @@ TEST_F(ServerTest, 404WithBodyTesting)
       Cannot find content entry invalid-article
     </p>
 )"  },
+
+    { /* url */ "/ROOT/search?content=poor&pattern=whatever",
+      expected_page_title=="Fulltext search unavailable" &&
+      expected_css_url=="/ROOT/skin/search_results.css" &&
+      book_name=="poor" &&
+      book_title=="poor" &&
+      expected_body==R"(
+    <h1>Not Found</h1>
+    <p>
+      The fulltext search engine is not available for this content.
+    </p>
+)"  },
   };
 
   for ( const auto& t : testData ) {
@@ -769,6 +781,7 @@ TEST_F(ServerTest, 500)
   <head>
     <meta content="text/html;charset=UTF-8" http-equiv="content-type" />
     <title>Internal Server Error</title>
+
   </head>
   <body>
     <h1>Internal Server Error</h1>