diff --git a/CHANGES.md b/CHANGES.md
index 7d9ffb8b..51779e36 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,11 @@
 * Change remove deprecated files
 
 
+### 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
diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js
index 928f5dad..3630f8fb 100644
--- a/gui/slick/js/newShow.js
+++ b/gui/slick/js/newShow.js
@@ -395,8 +395,9 @@ $(document).ready(function () {
 
 	$('#search-results').on('click', '.stepone-result-radio', updateSampleText);
 
-	elNameToSearch.keyup(function (event) {
+	elNameToSearch.keydown(function (event) {
 		if (event.keyCode == 13) {
+			event.preventDefault();
 			elSearchName.click();
 		}
 	});