diff --git a/include/limesurvey/replacements.php b/include/limesurvey/replacements.php
index 27be5b0d..aecd4ca8 100644
--- a/include/limesurvey/replacements.php
+++ b/include/limesurvey/replacements.php
@@ -74,6 +74,7 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
 		{
 	        	$(".text").focus();
 		        $(".textarea").focus();
+			document[\'onkeypress\'] = checkEnter;
 		});
 		</script>';
 	}
diff --git a/include/limesurvey/scripts/survey_runtime.js b/include/limesurvey/scripts/survey_runtime.js
index a5ce8aa7..e67aaeb1 100644
--- a/include/limesurvey/scripts/survey_runtime.js
+++ b/include/limesurvey/scripts/survey_runtime.js
@@ -6,7 +6,7 @@ $(document).ready(function()
 	if (typeof checkconditions!='undefined') checkconditions();
 	if (typeof template_onload!='undefined') template_onload();
 	prepareCellAdapters();
-	document['onkeypress'] = checkEnter;
+//	document['onkeypress'] = checkEnter;
     if (typeof(focus_element) != 'undefined')
     {
         $(focus_element).focus();