diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e9978b..e91045e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [2.4.1 - 2019-08-04]
+
+### Fixed
+
+- Fixed a wonky search UI when there are no results.
+
 ## [2.4.0 - 2019-08-04]
 
 ### Added
diff --git a/backend/config/config.exs b/backend/config/config.exs
index 70aba29..59c071f 100644
--- a/backend/config/config.exs
+++ b/backend/config/config.exs
@@ -22,7 +22,7 @@ config :backend, Backend.Repo, queue_target: 5000
 
 instances_config_path =
   if System.get_env("MIX_ENV") == "prod",
-    do: "lib/backend-2.4.0/priv/elasticsearch/instances.json",
+    do: "lib/backend-2.4.1/priv/elasticsearch/instances.json",
     else: "priv/elasticsearch/instances.json"
 
 config :backend, Backend.Elasticsearch.Cluster,
diff --git a/backend/mix.exs b/backend/mix.exs
index 9eaca18..4008bc1 100644
--- a/backend/mix.exs
+++ b/backend/mix.exs
@@ -4,7 +4,7 @@ defmodule Backend.MixProject do
   def project do
     [
       app: :backend,
-      version: "2.4.0",
+      version: "2.4.1",
       elixir: "~> 1.5",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
diff --git a/frontend/package.json b/frontend/package.json
index 511db95..daa826c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "private": true,
   "scripts": {
     "start": "NODE_ENV=development react-scripts start",
diff --git a/frontend/src/components/screens/SearchScreen.tsx b/frontend/src/components/screens/SearchScreen.tsx
index 61ff743..7741a6f 100644
--- a/frontend/src/components/screens/SearchScreen.tsx
+++ b/frontend/src/components/screens/SearchScreen.tsx
@@ -120,7 +120,7 @@ class SearchScreen extends React.PureComponent<ISearchScreenProps, ISearchScreen
     return (
       <>
         {isSmallScreen && results.length === 0 && this.renderMobileWarning()}
-        <SearchBarContainer hasSearchResults={results.length > 0} hasError={!!error}>
+        <SearchBarContainer hasSearchResults={!!query && !!results} hasError={!!error}>
           <H2>Find an instance</H2>
           <InputGroup
             leftIcon={IconNames.SEARCH}