diff --git a/src/main/resources/static/js/templates.js b/src/main/resources/static/js/templates.js
index 258afb984f1fbcf651e8a7c6dd841d29f1dae2ab..3a760071db30d84fa9cc53c4b3dbf6c21de052ab 100644
--- a/src/main/resources/static/js/templates.js
+++ b/src/main/resources/static/js/templates.js
@@ -123,8 +123,13 @@ function enableHotKeys()
 
     Mousetrap.bind('enter', function()
     {
-        confirmTemplateSelection(false);
+        if(!isSearchFocused())
+        {
+            confirmTemplateSelection();
+        }
     });
+
+    handleKeyUpOrDown(false);
 }
 
 function handleKeyUpOrDown(isUp)