diff --git a/frontend/app/search/search-query.html b/frontend/app/search/search-query.html
index 509fce75..da2a0438 100644
--- a/frontend/app/search/search-query.html
+++ b/frontend/app/search/search-query.html
@@ -1,4 +1,4 @@
-<div ng-class="className">
+<div ng-class="[className, {'has-search-results': hasSearchResults = searchResults.views.length || searchResults.features.length > 0 || (searchResults.types | fmPropertyCount) > 0, 'has-map-results': hasMapResults = mapResults.length > 0, 'has-nothing': hasNothing = searchResults && !hasSearchResults && !hasMapResults}]">
 	<form ng-submit="search()">
 		<div class="form-group">
 			<div class="input-group">
@@ -14,9 +14,7 @@
 		</div>
 	</form>
 
-	{{hasSearchResults = searchResults.views.length || searchResults.features.length > 0 || (searchResults.types | fmPropertyCount) > 0; ""}}
-
-	<div uib-alert class="alert-danger no-results" ng-if="!hasSearchResults && mapResults.length == 0">No results have been found.</div>
+	<div uib-alert class="alert-danger no-results" ng-if="hasNothing">No results have been found.</div>
 
 	<div class="fm-search-results" ng-if="hasSearchResults">
 		<div ng-if="searchResults.views.length > 0">
diff --git a/frontend/app/search/search-query.scss b/frontend/app/search/search-query.scss
index f010a23e..4b0b4352 100644
--- a/frontend/app/search/search-query.scss
+++ b/frontend/app/search/search-query.scss
@@ -10,8 +10,20 @@
 	min-height: 42px;
 	min-width: 260px;
 
-	.fm-hasResults & {
-		min-height: 75px;
+	&.has-nothing {
+		min-height: 104px;
+	}
+
+	&.has-search-results {
+		min-height: 180px;
+
+		&.has-map-results {
+			min-height: 343px;
+		}
+	}
+
+	&.has-map-results {
+		min-height: 184px;
 	}
 
 	&.fm-search-resized {
@@ -23,6 +35,7 @@
 		overflow: auto;
 		white-space: nowrap;
 		flex-grow: 1;
+		min-height: 105px;
 	}
 
 	.no-results {