diff --git a/Packages/worklist/components/worklist.styl b/Packages/worklist/components/worklist.styl
index f953ba6ad..f1242e4f3 100644
--- a/Packages/worklist/components/worklist.styl
+++ b/Packages/worklist/components/worklist.styl
@@ -10,7 +10,7 @@ body
   user-select: none
 
 input.worklist-search
-  height: 20px
+  height: 25px
   background-color: #888888
 
 #tblStudyList
diff --git a/Packages/worklist/components/worklistResult/worklistResult.html b/Packages/worklist/components/worklistResult/worklistResult.html
index 42d655718..ca6f7e602 100644
--- a/Packages/worklist/components/worklistResult/worklistResult.html
+++ b/Packages/worklist/components/worklistResult/worklistResult.html
@@ -7,7 +7,7 @@
                     Patient Name
                 </div>
                 <div class="patient-name-input">
-                     <input type="search" class="form-control worklist-search" id="patientName">
+                     <input type="text" class="form-control worklist-search" id="patientName">
                 </div>
             </th>
             <th>
@@ -15,7 +15,7 @@
                     Patient ID
                 </div>
                 <div class="patientid-input">
-                     <input type="search" class="form-control worklist-search" id="patientId">
+                     <input type="text" class="form-control worklist-search" id="patientId">
                 </div>
             </th>
 
@@ -25,7 +25,7 @@
                         Accession #
                     </div>
                     <div class="worklist-input">
-                        <input type="search" class="form-control worklist-search" id="accessionNumber">
+                        <input type="text" class="form-control worklist-search" id="accessionNumber">
                     </div>
                 </th>
             {{/unless}}
@@ -35,7 +35,7 @@
                     Study Date
                 </div>
                 <div class="worklist-input">
-                    <input type="search" class="form-control worklist-search" id="studyDate">
+                    <input type="text" class="form-control worklist-search" id="studyDate">
                 </div>
             </th>
 
@@ -45,7 +45,7 @@
                         Modality
                     </div>
                     <div class="modality-input">
-                        <input type="search" class="form-control worklist-search" id="modality" style="visibility: hidden; ">
+                        <input type="text" class="form-control worklist-search" id="modality" style="visibility: hidden; ">
                     </div>
                 </th>
             {{/unless}}
@@ -54,7 +54,7 @@
                     StudyDescription
                 </div>
                 <div class="study-description-input">
-                    <input type="search" class="form-control worklist-search" id="studyDescription" style="visibility: hidden; ">
+                    <input type="text" class="form-control worklist-search" id="studyDescription" style="visibility: hidden; ">
                 </div>
             </th>
 
@@ -64,7 +64,7 @@
                         # Images
                     </div>
                     <div class="worklist-input">
-                        <input type="search" class="form-control worklist-search" id="numberOfImages" style="visibility: hidden; ">
+                        <input type="text" class="form-control worklist-search" id="numberOfImages" style="visibility: hidden; ">
                     </div>
                 </th>
             {{/unless}}
diff --git a/Packages/worklist/components/worklistResult/worklistResult.js b/Packages/worklist/components/worklistResult/worklistResult.js
index d355533e6..f26aa8912 100644
--- a/Packages/worklist/components/worklistResult/worklistResult.js
+++ b/Packages/worklist/components/worklistResult/worklistResult.js
@@ -111,8 +111,10 @@ function search() {
 }
 
 Template.worklistResult.events({
-    'search': function(event) {
-        search();
+    'keypress': function(event) {
+        if (event.keyCode === 13) { //  Enter
+            search();
+        }
     },
     'onsearch': function(event) {
         search();