diff --git a/Packages/viewerbase/client/components/basic/studyNotFound/studyNotFound.html b/Packages/viewerbase/client/components/basic/studyNotFound/studyNotFound.html
new file mode 100644
index 000000000..6be493a8e
--- /dev/null
+++ b/Packages/viewerbase/client/components/basic/studyNotFound/studyNotFound.html
@@ -0,0 +1,5 @@
+<template name="studyNotFound">
+    <div class="studyNotFound">
+        <h5>Study not found</h5>
+    </div>
+</template>
\ No newline at end of file
diff --git a/Packages/viewerbase/client/components/basic/studyNotFound/studyNotFound.styl b/Packages/viewerbase/client/components/basic/studyNotFound/studyNotFound.styl
new file mode 100644
index 000000000..cbf3396c4
--- /dev/null
+++ b/Packages/viewerbase/client/components/basic/studyNotFound/studyNotFound.styl
@@ -0,0 +1,6 @@
+.studyNotFound
+  margin: 30px
+
+  h5
+    text-align: center
+    color: #888888
\ No newline at end of file
diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js
index 885029111..bd8602a72 100644
--- a/Packages/viewerbase/package.js
+++ b/Packages/viewerbase/package.js
@@ -41,6 +41,9 @@ Package.onUse(function(api) {
     api.addFiles('client/components/basic/loadingText/loadingText.html', 'client');
     api.addFiles('client/components/basic/loadingText/loadingText.styl', 'client');
 
+    api.addFiles('client/components/basic/studyNotFound/studyNotFound.html', 'client');
+    api.addFiles('client/components/basic/studyNotFound/studyNotFound.styl', 'client');
+
     api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.html', 'client');
     api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.styl', 'client');
 
diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.html b/Packages/worklist/client/components/worklistResult/worklistResult.html
index c96a0950c..c92ffc86b 100644
--- a/Packages/worklist/client/components/worklistResult/worklistResult.html
+++ b/Packages/worklist/client/components/worklistResult/worklistResult.html
@@ -44,11 +44,15 @@
         </thead>
         <tbody id="studyListData">
         {{#each studies}}
-            {{ >worklistStudy }}
+            {{>worklistStudy }}
         {{/each}}
         </tbody>
     </table>
-    {{ #unless studies.count }}
-        {{ >loadingText }}
-    {{ /unless }}
+    {{#if showLoadingText}}
+        {{>loadingText}}
+    {{/if}}
+
+    {{#if showNotFoundMessage}}
+        {{>studyNotFound}}
+    {{/if}}
 </template>
\ No newline at end of file
diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.js b/Packages/worklist/client/components/worklistResult/worklistResult.js
index 5e631851d..976c49ee1 100644
--- a/Packages/worklist/client/components/worklistResult/worklistResult.js
+++ b/Packages/worklist/client/components/worklistResult/worklistResult.js
@@ -1,3 +1,5 @@
+Session.setDefault("searchResults", {showLoadingText: true, showNotFoundMessage: false});
+
 Template.worklistResult.helpers({
     /**
      * Returns a sorted instance of the WorklistStudies Collection
@@ -10,6 +12,15 @@ Template.worklistResult.helpers({
                 studyDate: 1
             }
         });
+    },
+
+    showLoadingText: function() {
+        return Session.get("searchResults").showLoadingText;
+    },
+
+    showNotFoundMessage: function() {
+        return Session.get("searchResults").showNotFoundMessage;
+
     }
 });
 
@@ -73,6 +84,12 @@ function convertStringToStudyDate(dateStr) {
  * Inserts the identified studies into the WorklistStudies Collection
  */
 function search() {
+    // Show loading message
+    var searchResults = Session.get("searchResults");
+    searchResults.showLoadingText = true;
+    searchResults.showNotFoundMessage = false;
+    Session.set("searchResults", searchResults);
+
     // Create the filters to be used for the Worklist Search
     filter = {
         patientName: getFilter($('input#patientName').val()),
@@ -94,10 +111,14 @@ function search() {
             return;
         }
 
+        // Hide loading text
+        searchResults.showLoadingText = false;
+        Session.set("searchResults", searchResults);
+
         if (!studies) {
             return;
         }
-        
+
         // Loop through all identified studies
         studies.forEach(function(study) {
 
@@ -110,6 +131,14 @@ function search() {
             }
         });
 
+        if (WorklistStudies.find().count() === 0) {
+            // Show notFound text
+            searchResults.showNotFoundMessage = true;
+            Session.set("searchResults", searchResults);
+        }
+
+
+
     });
 }