diff --git a/CHANGES.md b/CHANGES.md
index d9294fa4..1ee43a11 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,9 @@
-### 0.17.7 (2018-09-26 18:30:00 UTC)
+### 0.17.8 (2018-10-02 13:15:00 UTC)
+
+* Fix executing addshow form prematurely
+
+
+### 0.17.7 (2018-09-26 18:30:00 UTC)
 
 * Fix conflicting chars search with RarBG torrent provider
 * Change improve Zooqle search
diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js
index b4512481..437e5f9a 100644
--- a/gui/slick/js/newShow.js
+++ b/gui/slick/js/newShow.js
@@ -364,8 +364,9 @@ $(document).ready(function () {
 
 	$('#searchResults').on('click', '.stepone-result-radio', updateSampleText);
 
-	elNameToSearch.keyup(function (event) {
+	elNameToSearch.keydown(function (event) {
 		if (event.keyCode == 13) {
+			event.preventDefault();
 			elSearchName.click();
 		}
 	});