diff --git a/client/components/MessageSearchForm.vue b/client/components/MessageSearchForm.vue
index 0378db56..6f22fce3 100644
--- a/client/components/MessageSearchForm.vue
+++ b/client/components/MessageSearchForm.vue
@@ -9,6 +9,7 @@
 				class="input"
 				placeholder="Search messages…"
 				@blur="closeSearch"
+				@keyup.esc="closeSearch"
 			/>
 		</div>
 		<button
@@ -113,6 +114,7 @@ export default {
 	methods: {
 		closeSearch() {
 			if (!this.onSearchPage) {
+				this.searchInput = "";
 				this.searchOpened = false;
 			}
 		},
diff --git a/client/components/Windows/SearchResults.vue b/client/components/Windows/SearchResults.vue
index 159b702c..4401e136 100644
--- a/client/components/Windows/SearchResults.vue
+++ b/client/components/Windows/SearchResults.vue
@@ -93,6 +93,7 @@
 
 <script>
 import socket from "../../js/socket";
+import eventbus from "../../js/eventbus";
 
 import SidebarToggle from "../SidebarToggle.vue";
 import Message from "../Message.vue";
@@ -171,11 +172,16 @@ export default {
 	mounted() {
 		this.setActiveChannel();
 		this.doSearch();
+
+		eventbus.on("escapekey", this.closeSearch);
 		this.$root.$on("re-search", this.doSearch); // Enable MessageSearchForm to search for the same query again
 	},
 	beforeDestroy() {
 		this.$root.$off("re-search");
 	},
+	destroyed() {
+		eventbus.off("escapekey", this.closeSearch);
+	},
 	methods: {
 		setActiveChannel() {
 			this.$store.commit("activeChannel", this.chan);