diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e3a90828d..b50a3d4fab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
  - [#1769](https://github.com/poanetwork/blockscout/pull/1769) - add timestamp to block overview
  - [#1768](https://github.com/poanetwork/blockscout/pull/1768) - fix first block parameter
  - [#1778](https://github.com/poanetwork/blockscout/pull/1778) - Make websocket optional for realtime fetcher
+ - [#1793](https://github.com/poanetwork/blockscout/pull/1793) - fix top nav autocomplete
  - [#1795](https://github.com/poanetwork/blockscout/pull/1795) - fix line numbers for decompiled contracts
 
 ### Chore
diff --git a/apps/block_scout_web/assets/css/components/_navbar.scss b/apps/block_scout_web/assets/css/components/_navbar.scss
index 455011273a..667414d98a 100644
--- a/apps/block_scout_web/assets/css/components/_navbar.scss
+++ b/apps/block_scout_web/assets/css/components/_navbar.scss
@@ -20,6 +20,7 @@
     form {
       flex-grow: 1;
     }
+
   }
 
   .input-group {
@@ -79,9 +80,8 @@
   background: transparent;
   width: auto;
   font-size: 12px;
-  border-right: none;
+  border: none;
   color: $white;
-  border-color: transparentize($white, 0.30);
   padding-right: 0px;
 
 
@@ -109,12 +109,11 @@
 
 .navbar .input-group-text {
   background: none;
-  border-left: none;
-  border-color: transparentize($white, 0.30);
+  border: none;
 }
 
 .input-group-append {
-  margin-left: 0px;
+  margin-left: -0.5px;
 
   path {
     fill: $secondary;
@@ -160,3 +159,7 @@
     color: $white;
   }
 }
+
+.add-border {
+  border: 1px solid transparentize($white, 0.30);
+}
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index 770dcdd436..f000e09111 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -78,7 +78,7 @@
         </li>
       </ul>
       <div class="search-form d-lg-flex d-inline-block">
-        <%= form_for @conn, chain_path(@conn, :search), [class: "form-inline my-2 my-lg-0", method: :get, enforce_utf8: false], fn f -> %>
+        <%= form_for @conn, chain_path(@conn, :search), [class: "form-inline my-2 my-lg-0 add-border", method: :get, enforce_utf8: false], fn f -> %>
 
         <div class="input-group">
               <%= awesomplete(f, :q,
@@ -93,8 +93,9 @@
                   prepop: true,
                   minChars: 3,
                   maxItems: 8,
-                  value: "symbol",
+                  value: "contract_address_hash",
                   label: "contract_address_hash",
+                  descrSearch: true,
                   descr: "symbol"
                   ]) %>
               <div class="input-group-append">
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
index c9c533138e..b3b6ba0665 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
@@ -19,17 +19,6 @@
     <link rel="stylesheet" href="https://nico-amsterdam.github.io/awesomplete-util/css/awesomplete.css">
     <script src="https://nico-amsterdam.github.io/awesomplete-util/js/awesomplete.min.js"></script>
     <script src="https://nico-amsterdam.github.io/awesomplete-util/js/awesomplete-util.min.js"></script>
-    <style>
-      div.awesomplete {display: block}
-
-      div.awesomplete ul li p {display: block; font-size: small; margin-left: 1em}
-
-      div.awesomplete .awe-found {border: 2px solid green}
-
-      .hide-not-found div.awesomplete .awe-not-found {border-color: lightblue}
-
-      div.awesomplete .awe-not-found {border: 2px solid red}
-    </style>
 
     <%= render_existing(@view_module, "_metatags.html", assigns) || render("_default_title.html") %>
   </head>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 55621eb6ef..c4d03d82ec 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -62,7 +62,7 @@ msgid "(query)"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:46
+#: lib/block_scout_web/templates/layout/app.html.eex:35
 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate."
 msgstr ""
 
@@ -155,7 +155,7 @@ msgid "Block Height: %{height}"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:61
+#: lib/block_scout_web/templates/layout/app.html.eex:50
 msgid "Block Mined, awaiting import..."
 msgstr ""
 
@@ -182,7 +182,7 @@ msgid "Blocks"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:60
+#: lib/block_scout_web/templates/layout/app.html.eex:49
 msgid "Blocks Indexed"
 msgstr ""
 
@@ -389,7 +389,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address/_balance_card.html.eex:13
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:16
-#: lib/block_scout_web/templates/layout/app.html.eex:66
+#: lib/block_scout_web/templates/layout/app.html.eex:55
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:27
 #: lib/block_scout_web/templates/transaction/overview.html.eex:181
@@ -472,7 +472,7 @@ msgid "IN"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:62
+#: lib/block_scout_web/templates/layout/app.html.eex:51
 msgid "Indexing Tokens"
 msgstr ""
 
@@ -508,7 +508,7 @@ msgid "Inventory"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:63
+#: lib/block_scout_web/templates/layout/app.html.eex:52
 msgid "Less than"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:28
-#: lib/block_scout_web/templates/layout/app.html.eex:64
+#: lib/block_scout_web/templates/layout/app.html.eex:53
 #: lib/block_scout_web/views/address_view.ex:121
 msgid "Market Cap"
 msgstr ""
@@ -679,7 +679,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:21
-#: lib/block_scout_web/templates/layout/app.html.eex:65
+#: lib/block_scout_web/templates/layout/app.html.eex:54
 msgid "Price"
 msgstr ""
 
@@ -729,7 +729,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:89
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:106
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:107
 msgid "Search"
 msgstr ""
 
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 7d7554d7d7..26503607c4 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -62,7 +62,7 @@ msgid "(query)"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:46
+#: lib/block_scout_web/templates/layout/app.html.eex:35
 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate."
 msgstr ""
 
@@ -155,7 +155,7 @@ msgid "Block Height: %{height}"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:61
+#: lib/block_scout_web/templates/layout/app.html.eex:50
 msgid "Block Mined, awaiting import..."
 msgstr ""
 
@@ -182,7 +182,7 @@ msgid "Blocks"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:60
+#: lib/block_scout_web/templates/layout/app.html.eex:49
 msgid "Blocks Indexed"
 msgstr ""
 
@@ -389,7 +389,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address/_balance_card.html.eex:13
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:16
-#: lib/block_scout_web/templates/layout/app.html.eex:66
+#: lib/block_scout_web/templates/layout/app.html.eex:55
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:27
 #: lib/block_scout_web/templates/transaction/overview.html.eex:181
@@ -472,7 +472,7 @@ msgid "IN"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:62
+#: lib/block_scout_web/templates/layout/app.html.eex:51
 msgid "Indexing Tokens"
 msgstr ""
 
@@ -508,7 +508,7 @@ msgid "Inventory"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:63
+#: lib/block_scout_web/templates/layout/app.html.eex:52
 msgid "Less than"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:28
-#: lib/block_scout_web/templates/layout/app.html.eex:64
+#: lib/block_scout_web/templates/layout/app.html.eex:53
 #: lib/block_scout_web/views/address_view.ex:121
 msgid "Market Cap"
 msgstr ""
@@ -679,7 +679,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:21
-#: lib/block_scout_web/templates/layout/app.html.eex:65
+#: lib/block_scout_web/templates/layout/app.html.eex:54
 msgid "Price"
 msgstr ""
 
@@ -729,7 +729,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:89
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:106
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:107
 msgid "Search"
 msgstr ""