diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1229543..c13b70a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- You can now click a button in the search bar to search (you can also still just prss enter, of course).
+
 ### Changed
 
 ### Deprecated
diff --git a/frontend/src/components/screens/SearchScreen.tsx b/frontend/src/components/screens/SearchScreen.tsx
index 2876a72..6addd17 100644
--- a/frontend/src/components/screens/SearchScreen.tsx
+++ b/frontend/src/components/screens/SearchScreen.tsx
@@ -1,4 +1,4 @@
-import { Button, Callout, Classes, H2, Intent, NonIdealState, Spinner } from "@blueprintjs/core";
+import { Button, Callout, H2, InputGroup, Intent, NonIdealState, Spinner } from "@blueprintjs/core";
 import { IconNames } from "@blueprintjs/icons";
 import { push } from "connected-react-router";
 import React from "react";
@@ -60,24 +60,19 @@ class SearchScreen extends React.PureComponent<ISearchScreenProps, ISearchScreen
   public render() {
     const { error, hasMoreResults, results, isLoadingResults, query } = this.props;
 
+    let content;
     if (error) {
-      return <NonIdealState icon={IconNames.ERROR} title="Something went wrong." action={this.renderSearchBar()} />;
+      content = <NonIdealState icon={IconNames.ERROR} title="Something went wrong." />;
     } else if (!isLoadingResults && query && results.length === 0) {
-      return (
+      content = (
         <NonIdealState
           icon={IconNames.SEARCH}
           title="No search results"
           description="Try searching for something else."
-          action={this.renderSearchBar()}
         />
       );
-    }
-
-    return (
-      <SearchContainer>
-        {isSmallScreen && results.length === 0 && this.renderMobileWarning()}
-        <H2>Find an instance</H2>
-        {this.renderSearchBar()}
+    } else if (!!results && results.length > 0) {
+      content = (
         <SearchResults>
           {results.map(result => (
             <SearchResult
@@ -95,6 +90,37 @@ class SearchScreen extends React.PureComponent<ISearchScreenProps, ISearchScreen
             </Button>
           )}
         </SearchResults>
+      );
+    }
+
+    let rightSearchBarElement;
+    if (isLoadingResults) {
+      rightSearchBarElement = <Spinner size={Spinner.SIZE_SMALL} />;
+    } else if (query) {
+      rightSearchBarElement = <Button minimal={true} icon={IconNames.CROSS} onClick={this.clearQuery} />;
+    } else {
+      rightSearchBarElement = (
+        <Button minimal={true} icon={IconNames.ARROW_RIGHT} intent={Intent.PRIMARY} onClick={this.search} />
+      );
+    }
+
+    return (
+      <SearchContainer>
+        {isSmallScreen && results.length === 0 && this.renderMobileWarning()}
+        <H2>Find an instance</H2>
+        <SearchBarContainer>
+          <InputGroup
+            leftIcon={IconNames.SEARCH}
+            rightElement={rightSearchBarElement}
+            large={true}
+            placeholder="Search instance names and descriptions"
+            type="search"
+            value={this.state.currentQuery}
+            onChange={this.handleInputChange}
+            onKeyPress={this.handleKeyPress}
+          />
+        </SearchBarContainer>
+        {content}
       </SearchContainer>
     );
   }
@@ -113,6 +139,11 @@ class SearchScreen extends React.PureComponent<ISearchScreenProps, ISearchScreen
     this.props.handleSearch(this.state.currentQuery);
   };
 
+  private clearQuery = () => {
+    this.setState({ currentQuery: "" });
+    this.props.handleSearch("");
+  };
+
   private selectInstanceFactory = (domain: string) => () => {
     this.props.setIsHoveringOver(undefined);
     this.props.navigateToInstance(domain);
@@ -126,21 +157,6 @@ class SearchScreen extends React.PureComponent<ISearchScreenProps, ISearchScreen
     this.props.setIsHoveringOver(undefined);
   };
 
-  private renderSearchBar = () => (
-    <SearchBarContainer className={`${Classes.INPUT_GROUP} ${Classes.LARGE}`}>
-      <span className={`${Classes.ICON} bp3-icon-${IconNames.SEARCH}`} />
-      <input
-        className={Classes.INPUT}
-        type="search"
-        placeholder="Instance name"
-        dir="auto"
-        value={this.state.currentQuery}
-        onChange={this.handleInputChange}
-        onKeyPress={this.handleKeyPress}
-      />
-    </SearchBarContainer>
-  );
-
   private renderMobileWarning = () => (
     <CalloutContainer>
       <Callout intent={Intent.WARNING} title="Desktop site">